diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index dff9783b..7beea1a1 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). @@ -193,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: @@ -216,15 +220,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: "hema-onhost-ci-lock-staging-testing" 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_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 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 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 f7a3c7f3..0b10df82 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -183,10 +183,18 @@ def read_distro_packages(distro_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 [] + 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: @@ -211,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__":