From 2ce8552327fddc2e63a5fc3619b116a55b350d3f Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Mon, 8 Apr 2024 09:28:46 -0700 Subject: [PATCH 1/6] update codebuild tests --- codebuild/linux-integration-tests.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/codebuild/linux-integration-tests.yml b/codebuild/linux-integration-tests.yml index 8e1e0a1f7..ba36185de 100644 --- a/codebuild/linux-integration-tests.yml +++ b/codebuild/linux-integration-tests.yml @@ -1,13 +1,19 @@ version: 0.1 env: shell: bash + variables: + BUILDER_VERSION: v0.9.56 + BUILDER_SOURCE: releases + BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net + PACKAGE_NAME: aws-crt-swift + phases: build: commands: - echo Build started on `date` - - aws s3 cp s3://aws-crt-test-stuff/setup_proxy_test_env.sh /tmp/setup_proxy_test_env.sh - - chmod a+xr /tmp/setup_proxy_test_env.sh - - $CODEBUILD_SRC_DIR/codebuild/linux-integration-tests.sh + - python3 -c "from urllib.request import urlretrieve; urlretrieve('$BUILDER_HOST/$BUILDER_SOURCE/$BUILDER_VERSION/builder.pyz?run=$CODEBUILD_BUILD_ID', 'builder.pyz')" + - python3 builder.pyz build --project aws-crt-cpp downstream --cmake-extra=-DUSE_OPENSSL=ON + post_build: commands: - echo Build completed on `date` From b635e2bb87db12968d3590f30b846ead87965c9e Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Mon, 8 Apr 2024 09:36:25 -0700 Subject: [PATCH 2/6] fix env var for codebuild --- codebuild/linux-integration-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codebuild/linux-integration-tests.yml b/codebuild/linux-integration-tests.yml index ba36185de..f398bf5f7 100644 --- a/codebuild/linux-integration-tests.yml +++ b/codebuild/linux-integration-tests.yml @@ -2,10 +2,10 @@ version: 0.1 env: shell: bash variables: - BUILDER_VERSION: v0.9.56 - BUILDER_SOURCE: releases - BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net - PACKAGE_NAME: aws-crt-swift + BUILDER_VERSION: v0.9.56 + BUILDER_SOURCE: releases + BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net + PACKAGE_NAME: aws-crt-swift phases: build: From fc39b59f782a8acdbd2d627eeb2b43255aef4044 Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Mon, 8 Apr 2024 09:52:34 -0700 Subject: [PATCH 3/6] update codebuild yaml version --- codebuild/linux-integration-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/codebuild/linux-integration-tests.yml b/codebuild/linux-integration-tests.yml index f398bf5f7..4e70e0e7e 100644 --- a/codebuild/linux-integration-tests.yml +++ b/codebuild/linux-integration-tests.yml @@ -1,4 +1,4 @@ -version: 0.1 +version: 0.2 env: shell: bash variables: @@ -11,8 +11,10 @@ phases: build: commands: - echo Build started on `date` + - git submodule update --init + - swift -v - python3 -c "from urllib.request import urlretrieve; urlretrieve('$BUILDER_HOST/$BUILDER_SOURCE/$BUILDER_VERSION/builder.pyz?run=$CODEBUILD_BUILD_ID', 'builder.pyz')" - - python3 builder.pyz build --project aws-crt-cpp downstream --cmake-extra=-DUSE_OPENSSL=ON + - python3 builder.pyz build --project $PACKAGE_NAME downstream --cmake-extra=-DUSE_OPENSSL=ON post_build: commands: From 2a82ffed4b58e9fd11a64f7108ef1810bee7072e Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Mon, 8 Apr 2024 10:24:49 -0700 Subject: [PATCH 4/6] kick codebuild From 44c9fbbbb1fa8d6b3038ee07b46638b57ec036f0 Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Mon, 8 Apr 2024 10:37:30 -0700 Subject: [PATCH 5/6] keep the proxy env script --- codebuild/linux-integration-tests.sh | 4 ++-- codebuild/linux-integration-tests.yml | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/codebuild/linux-integration-tests.sh b/codebuild/linux-integration-tests.sh index 304adb2fa..0ad51bd59 100755 --- a/codebuild/linux-integration-tests.sh +++ b/codebuild/linux-integration-tests.sh @@ -9,5 +9,5 @@ fi env swift -v -swift build -swift test +python3 -c "from urllib.request import urlretrieve; urlretrieve('$BUILDER_HOST/$BUILDER_SOURCE/$BUILDER_VERSION/builder.pyz?run=$CODEBUILD_BUILD_ID', 'builder.pyz')" +python3 builder.pyz build --project aws-crt-cpp downstream --cmake-extra=-DUSE_OPENSSL=ON diff --git a/codebuild/linux-integration-tests.yml b/codebuild/linux-integration-tests.yml index 4e70e0e7e..854af1a3f 100644 --- a/codebuild/linux-integration-tests.yml +++ b/codebuild/linux-integration-tests.yml @@ -11,10 +11,9 @@ phases: build: commands: - echo Build started on `date` - - git submodule update --init - - swift -v - - python3 -c "from urllib.request import urlretrieve; urlretrieve('$BUILDER_HOST/$BUILDER_SOURCE/$BUILDER_VERSION/builder.pyz?run=$CODEBUILD_BUILD_ID', 'builder.pyz')" - - python3 builder.pyz build --project $PACKAGE_NAME downstream --cmake-extra=-DUSE_OPENSSL=ON + - aws s3 cp s3://aws-crt-test-stuff/setup_proxy_test_env.sh /tmp/setup_proxy_test_env.sh + - chmod a+xr /tmp/setup_proxy_test_env.sh + - $CODEBUILD_SRC_DIR/codebuild/linux-integration-tests.sh post_build: commands: From 96e5fbe5e4cd7e12d341269a7b81d96d22c53f36 Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Mon, 8 Apr 2024 10:44:45 -0700 Subject: [PATCH 6/6] fix package name --- codebuild/linux-integration-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/linux-integration-tests.sh b/codebuild/linux-integration-tests.sh index 0ad51bd59..33de46c2f 100755 --- a/codebuild/linux-integration-tests.sh +++ b/codebuild/linux-integration-tests.sh @@ -10,4 +10,4 @@ env swift -v python3 -c "from urllib.request import urlretrieve; urlretrieve('$BUILDER_HOST/$BUILDER_SOURCE/$BUILDER_VERSION/builder.pyz?run=$CODEBUILD_BUILD_ID', 'builder.pyz')" -python3 builder.pyz build --project aws-crt-cpp downstream --cmake-extra=-DUSE_OPENSSL=ON +python3 builder.pyz build --project $PACKAGE_NAME downstream --cmake-extra=-DUSE_OPENSSL=ON