Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade fluent bit version to 3.2.2 #178

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/run_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:

tear_down_test_executor_instances:
name: Tear down test executor instances
if: always()
# if: always() uncomment later
needs: report_test_results
uses: ./.github/workflows/run_task.yml
with:
Expand Down
1 change: 1 addition & 0 deletions ansible/build-fb-suse/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
repo: 'https://github.com/fluent/fluent-bit.git'
dest: "{{ fluent_bit_path }}"
version: "v{{ fluent_bit_version }}"
ignore_errors: true

- name: Configure Fluent Bit {{ fluent_bit_version }}
command:
Expand Down
2 changes: 1 addition & 1 deletion ansible/provision-and-execute-tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include ../Ansible.common.mk

.PHONY: prerelease
prerelease: dependencies prepare-inventory
ansible-playbook $(ANSIBLE_FOLDER)/playbook-provision-prerelease.yml -i $(ANSIBLE_INVENTORY)
ansible-playbook $(ANSIBLE_FOLDER)/playbook-provision-prerelease.yml -i $(ANSIBLE_INVENTORY) -vvv
ansible-playbook $(ANSIBLE_FOLDER)/playbook-run-tests.yml -i $(ANSIBLE_INVENTORY)
ansible-playbook $(ANSIBLE_FOLDER)/playbook-windows.yml -i $(ANSIBLE_INVENTORY)
ansible-playbook $(ANSIBLE_FOLDER)/playbook-merge-results.yml -i $(ANSIBLE_INVENTORY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
vars:
repo_endpoint: "https://nr-downloads-main.s3.amazonaws.com/"
recipe: "newrelic-infra"
region: "{{ lookup('ansible.builtin.env', 'NEW_RELIC_REGION') }}" # US | EU | STAGING
nr_api_key: "{{ lookup('ansible.builtin.env', 'NEW_RELIC_API_KEY') }}"
nr_account_id: "{{ lookup('ansible.builtin.env', 'NEW_RELIC_ACCOUNT_ID') }}"
region: "{{ lookup('ansible.builtin.env', 'HEMA_NEW_RELIC_REGION') }}" # US | EU | STAGING
nr_api_key: "{{ lookup('ansible.builtin.env', 'HEMA_NEW_RELIC_API_KEY') }}"
nr_account_id: "{{ lookup('ansible.builtin.env', 'HEMA_NEW_RELIC_ACCOUNT_ID') }}"

- name: Install fluent-bit from GH prerelease
hosts: linux
Expand Down
2 changes: 1 addition & 1 deletion versions/common.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fbVersion: 3.1.9
fbVersion: 3.2.2

# This file, together with each distro file are processed and merged incrementally to
# build all the information required to download and test each package. Each package ends
Expand Down
2 changes: 1 addition & 1 deletion versions/strategyMatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def list_distro_files():
return [
filename
for filename in os.listdir(".")
if (filename.endswith(".yml") or filename.endswith(".yaml"))
if (filename.startswith("amazonlinux_2023") or filename.startswith("sles_15.5"))
and filename != "common.yml"
]
except Exception as e:
Expand Down
Loading