From 9a47564fb26954560922963a6e509e619f61c568 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Sat, 11 Feb 2023 18:58:30 -0500 Subject: [PATCH 1/3] Update `sccache` bucket This PR updates the `sccache` configuration settings to use a new bucket, `rapids-sccache-east`. Unlike the previous `rapids-sccache` bucket, `rapids-sccache-east` resides in the same AWS region as the rest of our CI infrastructure (`us-east-2`). This should result in faster, more reliable `sccache` connections and will also help keep our data transfer costs down. **Important Note**: The changes from [this `sccache` PR](https://github.com/mozilla/sccache/pull/1403) are required to use a bucket in `us-east-2`. These changes were incorporated in `sccache` `v0.3.2`, so you'll need that version or later (preferably the latest, `v0.3.3`). Please ensure that your CI images satisfy this constraint before merging this PR. Additionally, this PR updates the `SCCACHE_REGION` to the region of the bucket. This value is not meant to be a variable. --- .github/workflows/ci_pipe.yml | 4 ---- ci/scripts/github/common.sh | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml index c7d79b264a..c1a09c772b 100644 --- a/.github/workflows/ci_pipe.yml +++ b/.github/workflows/ci_pipe.yml @@ -18,9 +18,6 @@ name: CI Pipeline on: workflow_call: inputs: - aws_region: - default: 'us-west-2' - type: string run_check: required: true type: boolean @@ -39,7 +36,6 @@ on: required: true env: - AWS_DEFAULT_REGION: ${{ inputs.aws_region }} AWS_ACCESS_KEY_ID: "${{ secrets.GHA_AWS_ACCESS_KEY_ID }}" AWS_SECRET_ACCESS_KEY: "${{ secrets.GHA_AWS_SECRET_ACCESS_KEY }}" CHANGE_TARGET: "${{ github.base_ref }}" diff --git a/ci/scripts/github/common.sh b/ci/scripts/github/common.sh index 4581670878..9d42be4218 100644 --- a/ci/scripts/github/common.sh +++ b/ci/scripts/github/common.sh @@ -55,8 +55,8 @@ export DISPLAY_ARTIFACT_URL="${DISPLAY_URL}${ARTIFACT_ENDPOINT}/" # Set sccache env vars export SCCACHE_S3_KEY_PREFIX=morpheus-${NVARCH} -export SCCACHE_BUCKET=rapids-sccache -export SCCACHE_REGION="${AWS_DEFAULT_REGION}" +export SCCACHE_BUCKET=rapids-sccache-east +export SCCACHE_REGION="us-east-2" export SCCACHE_IDLE_TIMEOUT=32768 #export SCCACHE_LOG=debug From 6ad9db461cec6f6aab3a1eb6197a523e653b9e64 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Mon, 13 Feb 2023 09:45:33 -0800 Subject: [PATCH 2/3] Log sccache version --- ci/scripts/github/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/scripts/github/build.sh b/ci/scripts/github/build.sh index 457705b784..29c4a7190b 100755 --- a/ci/scripts/github/build.sh +++ b/ci/scripts/github/build.sh @@ -26,6 +26,7 @@ gcc --version g++ --version cmake --version ninja --version +sccache --version rapids-logger "Configuring cmake for Morpheus" git submodule update --init --recursive From ac97ddc852e0191adc2b20b32dad507ba6498967 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Mon, 13 Feb 2023 09:57:21 -0800 Subject: [PATCH 3/3] Adopt updated CI runner with sccache 0.3.3 --- .github/workflows/pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2857b17286..d8276ee111 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -31,8 +31,8 @@ jobs: uses: ./.github/workflows/ci_pipe.yml with: run_check: ${{ startsWith(github.ref_name, 'pull-request/') }} - container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-driver-230125 - test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-230125 + container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-driver-230213 + test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-230213 secrets: GHA_AWS_ACCESS_KEY_ID: ${{ secrets.GHA_AWS_ACCESS_KEY_ID }} GHA_AWS_SECRET_ACCESS_KEY: ${{ secrets.GHA_AWS_SECRET_ACCESS_KEY }}