diff --git a/.github/workflows/run_e2e_tests.yml b/.github/workflows/run_e2e_tests.yml index 6f1420f3..57352502 100644 --- a/.github/workflows/run_e2e_tests.yml +++ b/.github/workflows/run_e2e_tests.yml @@ -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: diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index 8e40b82d..eee475c5 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -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: diff --git a/ansible/provision-and-execute-tests/Makefile b/ansible/provision-and-execute-tests/Makefile index 3a247cbc..24d9ca8b 100644 --- a/ansible/provision-and-execute-tests/Makefile +++ b/ansible/provision-and-execute-tests/Makefile @@ -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) diff --git a/ansible/provision-and-execute-tests/playbook-provision-prerelease.yml b/ansible/provision-and-execute-tests/playbook-provision-prerelease.yml index a432550f..78311734 100644 --- a/ansible/provision-and-execute-tests/playbook-provision-prerelease.yml +++ b/ansible/provision-and-execute-tests/playbook-provision-prerelease.yml @@ -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 diff --git a/versions/common.yml b/versions/common.yml index aeb21ce7..f06ccc6a 100644 --- a/versions/common.yml +++ b/versions/common.yml @@ -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 diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index f7a3c7f3..ff28beda 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -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: