From a16c6598f10fde4bb2b646ec4f0653aa8716fc48 Mon Sep 17 00:00:00 2001 From: Nghi Ho Date: Fri, 20 Dec 2024 15:32:54 -0800 Subject: [PATCH] Migrate 1st batch of CI jobs to CodeBuild (#2067) ### Description of changes: Migrate the following jobs from `integrations.yml` to CodeBuild: - `haproxy` - `trousers` - `ntp` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license. --- .github/workflows/integrations.yml | 36 ------------------- .../github_ci_integration_omnibus.yaml | 30 ++++++++++++++++ 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml index 66ad8a2347..9d85848f5d 100644 --- a/.github/workflows/integrations.yml +++ b/.github/workflows/integrations.yml @@ -10,18 +10,6 @@ concurrency: env: CC: gcc jobs: - haproxy: - if: github.repository_owner == 'aws' - runs-on: ubuntu-latest - steps: - - name: Install OS Dependencies - run: | - sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none - sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make - - uses: actions/checkout@v3 - - name: Run integration build - run: | - ./tests/ci/integration/run_haproxy_integration.sh tpm2-tss: if: github.repository_owner == 'aws' runs-on: ubuntu-latest @@ -63,30 +51,6 @@ jobs: - name: Run integration build run: | ./tests/ci/integration/run_tcpdump_integration.sh - trousers: - if: github.repository_owner == 'aws' - runs-on: ubuntu-latest - steps: - - name: Install OS Dependencies - run: | - sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none - sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make - - uses: actions/checkout@v3 - - name: Run trousers build - run: | - ./tests/ci/integration/run_trousers_integration.sh - ntp: - if: github.repository_owner == 'aws' - runs-on: ubuntu-latest - steps: - - name: Install OS Dependencies - run: | - sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none - sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make - - uses: actions/checkout@v3 - - name: Run ntp build - run: | - ./tests/ci/integration/run_ntp_integration.sh socat: if: github.repository_owner == 'aws' runs-on: ubuntu-latest diff --git a/tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml b/tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml index 5f7ecf92f5..ce5c38d2aa 100644 --- a/tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml +++ b/tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml @@ -220,3 +220,33 @@ batch: image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_latest variables: AWS_LC_CI_TARGET: "tests/ci/integration/run_librelp_integration.sh" + + - identifier: haproxy_integration_x86_64 + buildspec: tests/ci/codebuild/common/run_simple_target.yml + env: + type: LINUX_CONTAINER + privileged-mode: false + compute-type: BUILD_GENERAL1_SMALL + image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_latest + variables: + AWS_LC_CI_TARGET: "tests/ci/integration/run_haproxy_integration.sh" + + - identifier: trousers_integration_x86_64 + buildspec: tests/ci/codebuild/common/run_simple_target.yml + env: + type: LINUX_CONTAINER + privileged-mode: false + compute-type: BUILD_GENERAL1_SMALL + image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_latest + variables: + AWS_LC_CI_TARGET: "tests/ci/integration/run_trousers_integration.sh" + + - identifier: ntp_integration_x86_64 + buildspec: tests/ci/codebuild/common/run_simple_target.yml + env: + type: LINUX_CONTAINER + privileged-mode: false + compute-type: BUILD_GENERAL1_SMALL + image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_latest + variables: + AWS_LC_CI_TARGET: "tests/ci/integration/run_ntp_integration.sh"