From 79cb5383d6f906fe79d56c100738a05b5871aa2c Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Tue, 12 Nov 2024 16:46:21 +0530 Subject: [PATCH 01/23] run test cases for any specific file if mentioned --- versions/strategyMatrix.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index f7a3c7f3..dc7ff611 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -181,8 +181,16 @@ def read_distro_packages(distro_file): ] -def list_distro_files(): +def list_distro_files(specific_file): try: + if specific_file is not None: + # Check if the specified file exists and has the correct extension + if (specific_file.endswith(".yml") or specific_file.endswith(".yaml")) and os.path.isfile(specific_file): + return [specific_file] + else: + print(f"Specified file {specific_file} does not exist or has an invalid extension.") + return [] + return [ filename for filename in os.listdir(".") @@ -197,7 +205,7 @@ def list_distro_files(): def generate_matrix(): return [ add_package_details(package_data) - for distro_file in list_distro_files() + for distro_file in list_distro_files("amazonlinux_2.yml") for package_data in read_distro_packages(distro_file) ] From 22df1bde597679002d1247f388ad212146d5431a Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 13 Nov 2024 18:37:07 +0530 Subject: [PATCH 02/23] Add centos 10 for testing --- versions/centos_10.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 versions/centos_10.yml diff --git a/versions/centos_10.yml b/versions/centos_10.yml new file mode 100644 index 00000000..0d5c31a6 --- /dev/null +++ b/versions/centos_10.yml @@ -0,0 +1,7 @@ +osDistro: centos +osVersion: 10 +packages: + - arch: x86_64 + ami: ami-011d59a275b482a49 + - arch: aarch64 + ami: ami-008dee3b597bad5c2 \ No newline at end of file From 215ed9b0215fedbae9358e17a538a7f43b372721 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 13 Nov 2024 18:39:40 +0530 Subject: [PATCH 03/23] testing centos 10 --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index dc7ff611..c93062aa 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -205,7 +205,7 @@ def list_distro_files(specific_file): def generate_matrix(): return [ add_package_details(package_data) - for distro_file in list_distro_files("amazonlinux_2.yml") + for distro_file in list_distro_files("centos_10.yml") for package_data in read_distro_packages(distro_file) ] From 19a1894cd95b910e6df4b5d36586fd7752143f80 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sun, 17 Nov 2024 01:07:22 +0530 Subject: [PATCH 04/23] create local s3 bucket for testing to push packages --- .github/workflows/pull_request.yml | 12 ++++++------ versions/strategyMatrix.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index dff9783b..696cc8fc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -216,15 +216,15 @@ jobs: repo_name: "newrelic/fluent-bit-package" schema: "custom" schema_url: "https://github.com/newrelic/fluent-bit-package/releases/download/${{ env.PRE_RELEASE_NAME }}/generated-linux-schema-staging.yaml" - aws_access_key_id: ${{ secrets.OHAI_AWS_ACCESS_KEY_ID_STAGING }} - aws_secret_access_key: ${{ secrets.OHAI_AWS_SECRET_ACCESS_KEY_STAGING }} - aws_s3_bucket_name: "nr-downloads-ohai-staging" - aws_s3_lock_bucket_name: "onhost-ci-lock-staging" + aws_access_key_id: ${{ secrets.HEMA_LOGGING_AWS_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.HEMA_LOGGING_AWS_SECRET_ACCESS_KEY_ID}} + aws_s3_bucket_name: "hema-testing-e2e-fluent-bit" + aws_s3_lock_bucket_name: "" access_point_host: "staging" run_id: ${{ github.run_id }} aws_region: "us-east-1" - aws_role_session_name: ${{ secrets.OHAI_AWS_ROLE_SESSION_NAME_STAGING }} - aws_role_arn: ${{ secrets.OHAI_AWS_ROLE_ARN_STAGING }} + aws_role_session_name: ${{ }} + aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} # used for signing package stuff gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index c93062aa..dc7ff611 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -205,7 +205,7 @@ def list_distro_files(specific_file): def generate_matrix(): return [ add_package_details(package_data) - for distro_file in list_distro_files("centos_10.yml") + for distro_file in list_distro_files("amazonlinux_2.yml") for package_data in read_distro_packages(distro_file) ] From 13252c11c0f0d8f7c60dedc355f1b2a8f27854e7 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sun, 17 Nov 2024 11:19:44 +0530 Subject: [PATCH 05/23] testing centos 10 --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index dc7ff611..c93062aa 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -205,7 +205,7 @@ def list_distro_files(specific_file): def generate_matrix(): return [ add_package_details(package_data) - for distro_file in list_distro_files("amazonlinux_2.yml") + for distro_file in list_distro_files("centos_10.yml") for package_data in read_distro_packages(distro_file) ] From 1d77dd8f7a44c0219fe51af33637cee5abfb2447 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sun, 17 Nov 2024 11:58:38 +0530 Subject: [PATCH 06/23] remove centos 10 parameter --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index c93062aa..c0e74c0a 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -205,7 +205,7 @@ def list_distro_files(specific_file): def generate_matrix(): return [ add_package_details(package_data) - for distro_file in list_distro_files("centos_10.yml") + for distro_file in list_distro_files() for package_data in read_distro_packages(distro_file) ] From f8fbaa56687967b8672336130e71dc52f6213e24 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sun, 17 Nov 2024 12:04:36 +0530 Subject: [PATCH 07/23] revert back changes , s3 bucket details --- .github/workflows/pull_request.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 696cc8fc..dff9783b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -216,15 +216,15 @@ jobs: repo_name: "newrelic/fluent-bit-package" schema: "custom" schema_url: "https://github.com/newrelic/fluent-bit-package/releases/download/${{ env.PRE_RELEASE_NAME }}/generated-linux-schema-staging.yaml" - aws_access_key_id: ${{ secrets.HEMA_LOGGING_AWS_ACCESS_KEY_ID }} - aws_secret_access_key: ${{ secrets.HEMA_LOGGING_AWS_SECRET_ACCESS_KEY_ID}} - aws_s3_bucket_name: "hema-testing-e2e-fluent-bit" - aws_s3_lock_bucket_name: "" + aws_access_key_id: ${{ secrets.OHAI_AWS_ACCESS_KEY_ID_STAGING }} + aws_secret_access_key: ${{ secrets.OHAI_AWS_SECRET_ACCESS_KEY_STAGING }} + aws_s3_bucket_name: "nr-downloads-ohai-staging" + aws_s3_lock_bucket_name: "onhost-ci-lock-staging" access_point_host: "staging" run_id: ${{ github.run_id }} aws_region: "us-east-1" - aws_role_session_name: ${{ }} - aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} + aws_role_session_name: ${{ secrets.OHAI_AWS_ROLE_SESSION_NAME_STAGING }} + aws_role_arn: ${{ secrets.OHAI_AWS_ROLE_ARN_STAGING }} # used for signing package stuff gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded From a7838d50b589215056a457b26480e3cd0d67cba2 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sun, 17 Nov 2024 13:23:27 +0530 Subject: [PATCH 08/23] testing for amazonlinux 2023 --- versions/strategyMatrix.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index c0e74c0a..c47b4a77 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -181,20 +181,20 @@ def read_distro_packages(distro_file): ] -def list_distro_files(specific_file): +def list_distro_files(): try: - if specific_file is not None: - # Check if the specified file exists and has the correct extension - if (specific_file.endswith(".yml") or specific_file.endswith(".yaml")) and os.path.isfile(specific_file): - return [specific_file] - else: - print(f"Specified file {specific_file} does not exist or has an invalid extension.") - return [] + # if specific_file is not None: + # # Check if the specified file exists and has the correct extension + # if (specific_file.endswith(".yml") or specific_file.endswith(".yaml")) and os.path.isfile(specific_file): + # return [specific_file] + # else: + # print(f"Specified file {specific_file} does not exist or has an invalid extension.") + # return [] return [ filename for filename in os.listdir(".") - if (filename.endswith(".yml") or filename.endswith(".yaml")) + if (filename.startswith("amazonlinux_2023")) and filename != "common.yml" ] except Exception as e: From 6082ca2f0963d3928c23e0f6a82ba45ba3fac5b9 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Mon, 18 Nov 2024 16:35:02 +0530 Subject: [PATCH 09/23] update centos 8 ami and testing centos 8 --- versions/centos_8.yml | 2 +- versions/strategyMatrix.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/centos_8.yml b/versions/centos_8.yml index c545c568..3890bbb5 100644 --- a/versions/centos_8.yml +++ b/versions/centos_8.yml @@ -4,4 +4,4 @@ packages: - arch: x86_64 ami: ami-0af29b92a1457bf87 - arch: aarch64 - ami: ami-0dce27ea07b1afb8f + ami: ami-09f3af140f3b989cf diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index c47b4a77..4fa003a3 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -194,7 +194,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.startswith("amazonlinux_2023")) + if (filename.startswith("centos_8")) and filename != "common.yml" ] except Exception as e: From c38aa3ce78cdc31613d9e5b809ad0520659ba537 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Mon, 18 Nov 2024 17:52:36 +0530 Subject: [PATCH 10/23] add local s3 bucket --- .github/workflows/pull_request.yml | 12 ++++++------ versions/strategyMatrix.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index dff9783b..696cc8fc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -216,15 +216,15 @@ jobs: repo_name: "newrelic/fluent-bit-package" schema: "custom" schema_url: "https://github.com/newrelic/fluent-bit-package/releases/download/${{ env.PRE_RELEASE_NAME }}/generated-linux-schema-staging.yaml" - aws_access_key_id: ${{ secrets.OHAI_AWS_ACCESS_KEY_ID_STAGING }} - aws_secret_access_key: ${{ secrets.OHAI_AWS_SECRET_ACCESS_KEY_STAGING }} - aws_s3_bucket_name: "nr-downloads-ohai-staging" - aws_s3_lock_bucket_name: "onhost-ci-lock-staging" + aws_access_key_id: ${{ secrets.HEMA_LOGGING_AWS_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.HEMA_LOGGING_AWS_SECRET_ACCESS_KEY_ID}} + aws_s3_bucket_name: "hema-testing-e2e-fluent-bit" + aws_s3_lock_bucket_name: "" access_point_host: "staging" run_id: ${{ github.run_id }} aws_region: "us-east-1" - aws_role_session_name: ${{ secrets.OHAI_AWS_ROLE_SESSION_NAME_STAGING }} - aws_role_arn: ${{ secrets.OHAI_AWS_ROLE_ARN_STAGING }} + aws_role_session_name: ${{ }} + aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} # used for signing package stuff gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 4fa003a3..0b10df82 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -194,7 +194,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.startswith("centos_8")) + if (filename.startswith("amazonlinux_2023")) and filename != "common.yml" ] except Exception as e: @@ -219,7 +219,7 @@ def add_availability_flags(matrix): if "nrStagingPackageUrl" in pkg: url = pkg["nrStagingPackageUrl"] response = requests.head(url) - pkg["isStaging"] = True if response.status_code == 200 else False + pkg["isStaging"] = False if __name__ == "__main__": From 269fc25690357543783fbe76e9bcab1f2234d90a Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Mon, 18 Nov 2024 18:46:58 +0530 Subject: [PATCH 11/23] add production and staging availability false --- .github/workflows/pull_request.yml | 4 ++++ versions/strategyMatrix.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 696cc8fc..7b281c68 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -72,6 +72,10 @@ jobs: make schemas/generateSchemas; gh release upload ${{ env.PRE_RELEASE_NAME }} schemas/generated-linux-schema-staging.yaml --repo newrelic/fluent-bit-package gh release upload ${{ env.PRE_RELEASE_NAME }} schemas/generated-linux-schema-production.yaml --repo newrelic/fluent-bit-package + + - name: Print linux_and_windows_matrix value + run: | + echo "linux_and_windows_matrix: ${{ needs.setup_environment.outputs.linux_and_windows_matrix }}" # Downloads all Fluent Bit packages that are officially supported, preferably from the New Relic Infrastructure Agent # repository (Linux packages, already re-signed by NR) or Logging's S3 bucket (Windows packages, already packaged for the NRIA). diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 0b10df82..7a0a652e 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -215,7 +215,7 @@ def add_availability_flags(matrix): if "nrPackageUrl" in pkg: url = pkg["nrPackageUrl"] response = requests.head(url) - pkg["isProduction"] = True if response.status_code == 200 else False + pkg["isProduction"] = False if "nrStagingPackageUrl" in pkg: url = pkg["nrStagingPackageUrl"] response = requests.head(url) From da74d9c8c8c0abeacb1b887568e49a2a55250ffc Mon Sep 17 00:00:00 2001 From: voorepreethi Date: Mon, 18 Nov 2024 21:31:37 +0530 Subject: [PATCH 12/23] ci: updated session name --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7b281c68..e7abb5ea 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -227,7 +227,7 @@ jobs: access_point_host: "staging" run_id: ${{ github.run_id }} aws_region: "us-east-1" - aws_role_session_name: ${{ }} + aws_role_session_name: ${{ secrets.OHAI_AWS_ROLE_SESSION_NAME_STAGING }} aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} # used for signing package stuff gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} From 5a06e64405a9b584e952a1a9b5de955bf0b79f58 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Mon, 18 Nov 2024 23:55:01 +0530 Subject: [PATCH 13/23] update session name --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e7abb5ea..13f6b3ca 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -227,7 +227,7 @@ jobs: access_point_host: "staging" run_id: ${{ github.run_id }} aws_region: "us-east-1" - aws_role_session_name: ${{ secrets.OHAI_AWS_ROLE_SESSION_NAME_STAGING }} + aws_role_session_name: "testing-session-name" aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} # used for signing package stuff gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} From 7e687408fba4d91c0cbe7a1bc96cf412e1156d83 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Tue, 19 Nov 2024 00:02:49 +0530 Subject: [PATCH 14/23] update s3 bucket region --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 13f6b3ca..6f04640b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -226,7 +226,7 @@ jobs: aws_s3_lock_bucket_name: "" access_point_host: "staging" run_id: ${{ github.run_id }} - aws_region: "us-east-1" + aws_region: "us-east-2" aws_role_session_name: "testing-session-name" aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} # used for signing package stuff From 4779785e33d20f31ce1e1283c684739b92e8ff96 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Tue, 19 Nov 2024 00:27:57 +0530 Subject: [PATCH 15/23] remove sign_suse_package condition from run_e2e_tests_prerelease --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 6f04640b..4086949f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -197,7 +197,7 @@ jobs: # Runs E2E tests using the packages available in the tmp-pr-#PR prerelease run_e2e_tests_prerelease: - needs: [ setup_environment, sign_suse_packages, upload_official_packages_to_prerelease ] + needs: [ setup_environment, upload_official_packages_to_prerelease ] name: Run E2E tests by installing NRIA from Production and installing Fluent Bit from the PR pre-release uses: ./.github/workflows/run_e2e_tests.yml with: From f2d0581295c620fcaf37f9c9e17a8c005b4323f0 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Tue, 19 Nov 2024 17:48:08 +0530 Subject: [PATCH 16/23] revert back changes --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 7a0a652e..0b10df82 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -215,7 +215,7 @@ def add_availability_flags(matrix): if "nrPackageUrl" in pkg: url = pkg["nrPackageUrl"] response = requests.head(url) - pkg["isProduction"] = False + pkg["isProduction"] = True if response.status_code == 200 else False if "nrStagingPackageUrl" in pkg: url = pkg["nrStagingPackageUrl"] response = requests.head(url) From 10f4971786f2d6f4de819d189272f0f78c2e957f Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 20 Nov 2024 09:45:53 +0530 Subject: [PATCH 17/23] test sles_15.3 --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 0b10df82..b8b83394 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -194,7 +194,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.startswith("amazonlinux_2023")) + if (filename.startswith("sles_15.3")) and filename != "common.yml" ] except Exception as e: From 8ec6bd6efef5fea12bd346483175d80a049c4bd8 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 20 Nov 2024 09:50:26 +0530 Subject: [PATCH 18/23] test sles and amazonlinux 2023 --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index b8b83394..45951386 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -194,7 +194,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.startswith("sles_15.3")) + if (filename.startswith("sles_15.3") or filename.startswith("amazonlinux_2023")) and filename != "common.yml" ] except Exception as e: From 8829e979e40299d8aa6576346684846db9d1324e Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 20 Nov 2024 10:15:23 +0530 Subject: [PATCH 19/23] add sign_suse_packages back and test amazonlinux 2023 --- .github/workflows/pull_request.yml | 2 +- versions/strategyMatrix.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 4086949f..36360b61 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -197,7 +197,7 @@ jobs: # Runs E2E tests using the packages available in the tmp-pr-#PR prerelease run_e2e_tests_prerelease: - needs: [ setup_environment, upload_official_packages_to_prerelease ] + needs: [ setup_environment,sign_suse_packages, upload_official_packages_to_prerelease ] name: Run E2E tests by installing NRIA from Production and installing Fluent Bit from the PR pre-release uses: ./.github/workflows/run_e2e_tests.yml with: diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 45951386..0b10df82 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -194,7 +194,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.startswith("sles_15.3") or filename.startswith("amazonlinux_2023")) + if (filename.startswith("amazonlinux_2023")) and filename != "common.yml" ] except Exception as e: From 07f5a12ebbdb45b170eaa0ce24e501c2409691c5 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 20 Nov 2024 12:06:04 +0530 Subject: [PATCH 20/23] revert back availability value and remove sign_suse_packages dep --- .github/workflows/pull_request.yml | 2 +- versions/strategyMatrix.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 36360b61..4086949f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -197,7 +197,7 @@ jobs: # Runs E2E tests using the packages available in the tmp-pr-#PR prerelease run_e2e_tests_prerelease: - needs: [ setup_environment,sign_suse_packages, upload_official_packages_to_prerelease ] + needs: [ setup_environment, upload_official_packages_to_prerelease ] name: Run E2E tests by installing NRIA from Production and installing Fluent Bit from the PR pre-release uses: ./.github/workflows/run_e2e_tests.yml with: diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 0b10df82..c47b4a77 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -219,7 +219,7 @@ def add_availability_flags(matrix): if "nrStagingPackageUrl" in pkg: url = pkg["nrStagingPackageUrl"] response = requests.head(url) - pkg["isStaging"] = False + pkg["isStaging"] = True if response.status_code == 200 else False if __name__ == "__main__": From 7d772715d4c5ad24d3730f4fe0b5a3bb9bb36886 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 20 Nov 2024 12:11:51 +0530 Subject: [PATCH 21/23] staging availability tag false --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index c47b4a77..0b10df82 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -219,7 +219,7 @@ def add_availability_flags(matrix): if "nrStagingPackageUrl" in pkg: url = pkg["nrStagingPackageUrl"] response = requests.head(url) - pkg["isStaging"] = True if response.status_code == 200 else False + pkg["isStaging"] = False if __name__ == "__main__": From 425b9bd9cb0b8afbaedca54626886f6c9b3651ec Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 20 Nov 2024 14:35:30 +0530 Subject: [PATCH 22/23] add Configure AWS credentials from OIDC step in Publish linux packages to staging job --- .github/workflows/pull_request.yml | 61 ++++++++++++++++++------------ 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 4086949f..5e74ab44 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -208,30 +208,43 @@ jobs: secrets: inherit publish_linux_to_staging: - name: Publish linux packages to staging - needs: [ setup_environment, run_e2e_tests_prerelease ] - runs-on: ubuntu-latest - steps: - - name: Publish linux packages to staging - uses: newrelic/infrastructure-publish-action@v1 - with: - app_name: fluent-bit - tag: ${{ env.PRE_RELEASE_NAME }} - repo_name: "newrelic/fluent-bit-package" - schema: "custom" - schema_url: "https://github.com/newrelic/fluent-bit-package/releases/download/${{ env.PRE_RELEASE_NAME }}/generated-linux-schema-staging.yaml" - aws_access_key_id: ${{ secrets.HEMA_LOGGING_AWS_ACCESS_KEY_ID }} - aws_secret_access_key: ${{ secrets.HEMA_LOGGING_AWS_SECRET_ACCESS_KEY_ID}} - aws_s3_bucket_name: "hema-testing-e2e-fluent-bit" - aws_s3_lock_bucket_name: "" - access_point_host: "staging" - run_id: ${{ github.run_id }} - aws_region: "us-east-2" - aws_role_session_name: "testing-session-name" - aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} - # used for signing package stuff - gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} - gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded + name: Publish linux packages to staging + needs: [setup_environment, run_e2e_tests_prerelease] + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Configure AWS credentials from OIDC + uses: aws-actions/configure-aws-credentials@v1 + with: + role-to-assume: ${{ secrets.HEMA_AWS_ROLE_ARN }} + aws-region: us-east-2 + role-session-name: testing-session-name + + - name: Publish linux packages to staging + uses: newrelic/infrastructure-publish-action@v1 + with: + app_name: fluent-bit + tag: ${{ env.PRE_RELEASE_NAME }} + repo_name: "newrelic/fluent-bit-package" + schema: "custom" + schema_url: "https://github.com/newrelic/fluent-bit-package/releases/download/${{ env.PRE_RELEASE_NAME }}/generated-linux-schema-staging.yaml" + aws_s3_bucket_name: "hema-testing-e2e-fluent-bit" + aws_s3_lock_bucket_name: "" + access_point_host: "staging" + run_id: ${{ github.run_id }} + aws_region: "us-east-2" + aws_role_session_name: "testing-session-name" + aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} + # used for signing package stuff + gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} + gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }} run_e2e_tests_staging: needs: [ setup_environment, run_e2e_tests_prerelease, publish_linux_to_staging ] From 1d9ae2bdf760969ca21229b74058f969d06e8b9c Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 20 Nov 2024 16:34:21 +0530 Subject: [PATCH 23/23] remove aws config step --- .github/workflows/pull_request.yml | 61 ++++++++++++------------------ 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 5e74ab44..7beea1a1 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -208,43 +208,30 @@ jobs: secrets: inherit publish_linux_to_staging: - name: Publish linux packages to staging - needs: [setup_environment, run_e2e_tests_prerelease] - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Configure AWS credentials from OIDC - uses: aws-actions/configure-aws-credentials@v1 - with: - role-to-assume: ${{ secrets.HEMA_AWS_ROLE_ARN }} - aws-region: us-east-2 - role-session-name: testing-session-name - - - name: Publish linux packages to staging - uses: newrelic/infrastructure-publish-action@v1 - with: - app_name: fluent-bit - tag: ${{ env.PRE_RELEASE_NAME }} - repo_name: "newrelic/fluent-bit-package" - schema: "custom" - schema_url: "https://github.com/newrelic/fluent-bit-package/releases/download/${{ env.PRE_RELEASE_NAME }}/generated-linux-schema-staging.yaml" - aws_s3_bucket_name: "hema-testing-e2e-fluent-bit" - aws_s3_lock_bucket_name: "" - access_point_host: "staging" - run_id: ${{ github.run_id }} - aws_region: "us-east-2" - aws_role_session_name: "testing-session-name" - aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN }} - # used for signing package stuff - gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} - gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }} + name: Publish linux packages to staging + needs: [ setup_environment, run_e2e_tests_prerelease ] + runs-on: ubuntu-latest + steps: + - name: Publish linux packages to staging + uses: newrelic/infrastructure-publish-action@v1 + with: + app_name: fluent-bit + tag: ${{ env.PRE_RELEASE_NAME }} + repo_name: "newrelic/fluent-bit-package" + schema: "custom" + schema_url: "https://github.com/newrelic/fluent-bit-package/releases/download/${{ env.PRE_RELEASE_NAME }}/generated-linux-schema-staging.yaml" + aws_access_key_id: ${{ secrets.HEMA_LOGGING_AWS_ACCESS_KEY_ID}} + aws_secret_access_key: ${{ secrets.HEMA_LOGGING_AWS_SECRET_ACCESS_KEY_ID}} + aws_s3_bucket_name: "hema-testing-e2e-fluent-bit" + aws_s3_lock_bucket_name: "hema-onhost-ci-lock-staging-testing" + access_point_host: "staging" + run_id: ${{ github.run_id }} + aws_region: "us-east-2" + aws_role_session_name: "hema-testing-session-name" + aws_role_arn: ${{ secrets.HEMA_AWS_ROLE_ARN}} + # used for signing package stuff + gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }} + gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded run_e2e_tests_staging: needs: [ setup_environment, run_e2e_tests_prerelease, publish_linux_to_staging ]