Migrate jobs that do not need a Docker img update instead

aws · Dec 19, 2024 · a2078ac · a2078ac
1 parent 9b960f2
commit a2078ac
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml
@@ -21,30 +21,36 @@ jobs:
       - name: Run integration build
         run: |
           ./tests/ci/integration/run_tpm2_tss_integration.sh
-  trousers:
+  grpc:
     if: github.repository_owner == 'aws'
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      TZ: Etc/UTC
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:latest
+      options: --sysctl=net.ipv6.conf.all.disable_ipv6=0
     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
+          apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
+          apt-get -y --no-install-recommends install cmake gcc g++ ninja-build golang make python3 python3-sphinx autoconf libtool pkg-config git libc++-dev python3-six
       - uses: actions/checkout@v3
-      - name: Run trousers build
+      - name: Run integration build
         run: |
-          ./tests/ci/integration/run_trousers_integration.sh
-  ntp:
+          ./tests/ci/integration/run_grpc_integration.sh
+  tcpdump:
     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
+          sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make libpcap-dev binutils-dev
       - uses: actions/checkout@v3
-      - name: Run ntp build
+      - name: Run integration build
         run: |
-          ./tests/ci/integration/run_ntp_integration.sh
+          ./tests/ci/integration/run_tcpdump_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
@@ -231,22 +231,22 @@ batch:
         variables:
           AWS_LC_CI_TARGET: "tests/ci/integration/run_haproxy_integration.sh"
 
-    - identifier: grpc_integration_x86_64
+    - 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_XLARGE
+        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_grpc_integration.sh"
+          AWS_LC_CI_TARGET: "tests/ci/integration/run_trousers_integration.sh"
 
-    - identifier: tcpdump_integration_x86_64
+    - 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_tcpdump_integration.sh"
+          AWS_LC_CI_TARGET: "tests/ci/integration/run_ntp_integration.sh"