Skip to content

Commit c6d0748

Browse files
jakemasjakemas
committed
Merge branch 'main' of github.com:jakemas/aws-lc
2 parents 53dc064 + df47b42 commit c6d0748

File tree

3 files changed

+71
-84
lines changed

3 files changed

+71
-84
lines changed

‎.github/workflows/integrations.yml‎

Lines changed: 5 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@ concurrency:
1010
env:
1111
CC: gcc
1212
jobs:
13-
tpm2-tss:
13+
nmap:
1414
if: github.repository_owner == 'aws'
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Install OS Dependencies
1818
run: |
19-
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 autoconf-archive libcmocka0 libcmocka-dev procps iproute2 build-essential git pkg-config gcc libtool automake libssl-dev uthash-dev autoconf doxygen libjson-c-dev libini-config-dev libcurl4-openssl-dev uuid-dev libltdl-dev libusb-1.0-0-dev libftdi-dev libglib2.0-dev pandoc libpsl-dev
19+
sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
20+
sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make gobject-introspection
2021
- uses: actions/checkout@v3
21-
- name: Run integration build
22+
- name: Run nmap build
2223
run: |
23-
./tests/ci/integration/run_tpm2_tss_integration.sh
24+
./tests/ci/integration/run_nmap_integration.sh
2425
grpc:
2526
if: github.repository_owner == 'aws'
2627
env:
@@ -39,41 +40,6 @@ jobs:
3940
- name: Run integration build
4041
run: |
4142
./tests/ci/integration/run_grpc_integration.sh
42-
tcpdump:
43-
if: github.repository_owner == 'aws'
44-
runs-on: ubuntu-latest
45-
steps:
46-
- name: Install OS Dependencies
47-
run: |
48-
sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
49-
sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make libpcap-dev binutils-dev
50-
- uses: actions/checkout@v3
51-
- name: Run integration build
52-
run: |
53-
./tests/ci/integration/run_tcpdump_integration.sh
54-
socat:
55-
if: github.repository_owner == 'aws'
56-
runs-on: ubuntu-latest
57-
steps:
58-
- name: Install OS Dependencies
59-
run: |
60-
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 autoconf pkg-config openssl
61-
- uses: actions/checkout@v3
62-
- name: Run integration build
63-
run: |
64-
./tests/ci/integration/run_socat_integration.sh
65-
nmap:
66-
if: github.repository_owner == 'aws'
67-
runs-on: ubuntu-latest
68-
steps:
69-
- name: Install OS Dependencies
70-
run: |
71-
sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
72-
sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make gobject-introspection
73-
- uses: actions/checkout@v3
74-
- name: Run nmap build
75-
run: |
76-
./tests/ci/integration/run_nmap_integration.sh
7743
python-main:
7844
if: github.repository_owner == 'aws'
7945
runs-on: ubuntu-latest
@@ -112,32 +78,6 @@ jobs:
11278
env:
11379
FIPS: ${{ matrix.fips }}
11480
AWS_CRT_BUILD_USE_SYSTEM_LIBCRYPTO: ${{ matrix.openssl_in_crt }}
115-
openldap:
116-
if: github.repository_owner == 'aws'
117-
runs-on: ubuntu-latest
118-
name: OpenLDAP
119-
steps:
120-
- name: Install OS Dependencies
121-
run: |
122-
sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
123-
sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make
124-
- uses: actions/checkout@v3
125-
- name: Build AWS-LC, build openldap, run tests
126-
run: |
127-
./tests/ci/integration/run_openldap_integration.sh master OPENLDAP_REL_ENG_2_5
128-
cyrus-sasl:
129-
if: github.repository_owner == 'aws'
130-
runs-on: ubuntu-latest
131-
name: Cyrus-SASL
132-
steps:
133-
- name: Install OS Dependencies
134-
run: |
135-
sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
136-
sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make
137-
- uses: actions/checkout@v3
138-
- name: Build AWS-LC, build cyrus
139-
run: |
140-
./tests/ci/integration/run_cyrus_sasl_integration.sh
14181
bind9:
14282
if: github.repository_owner == 'aws'
14383
runs-on: ubuntu-latest
@@ -207,20 +147,6 @@ jobs:
207147
- name: Run libevent build
208148
run: |
209149
./tests/ci/integration/run_libevent_integration.sh
210-
amazon-corretto-crypto-provider:
211-
if: github.repository_owner == 'aws'
212-
runs-on: ubuntu-latest
213-
steps:
214-
- name: Install OS Dependencies
215-
run: |
216-
sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
217-
sudo apt-get -y --no-install-recommends install \
218-
curl gnupg build-essential lcov wget python3-pip cmake gcc ninja-build golang
219-
sudo pip3 install gcovr
220-
- uses: actions/checkout@v4
221-
- name: Run accp build
222-
run: |
223-
./tests/ci/integration/run_accp_integration.sh
224150
ruby-releases:
225151
if: github.repository_owner == 'aws'
226152
strategy:

‎tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml‎

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ batch:
227227
type: LINUX_CONTAINER
228228
privileged-mode: false
229229
compute-type: BUILD_GENERAL1_SMALL
230-
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_latest
230+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
231231
variables:
232232
AWS_LC_CI_TARGET: "tests/ci/integration/run_haproxy_integration.sh"
233233

@@ -237,7 +237,7 @@ batch:
237237
type: LINUX_CONTAINER
238238
privileged-mode: false
239239
compute-type: BUILD_GENERAL1_SMALL
240-
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_latest
240+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
241241
variables:
242242
AWS_LC_CI_TARGET: "tests/ci/integration/run_trousers_integration.sh"
243243

@@ -247,10 +247,10 @@ batch:
247247
type: LINUX_CONTAINER
248248
privileged-mode: false
249249
compute-type: BUILD_GENERAL1_SMALL
250-
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_latest
250+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
251251
variables:
252252
AWS_LC_CI_TARGET: "tests/ci/integration/run_ntp_integration.sh"
253-
253+
254254
- identifier: pq_tls_integration_x86_64
255255
buildspec: tests/ci/codebuild/common/run_simple_target.yml
256256
env:
@@ -260,3 +260,64 @@ batch:
260260
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_latest
261261
variables:
262262
AWS_LC_CI_TARGET: "tests/ci/integration/run_pq_tls_integration.sh"
263+
264+
- identifier: tpm2_tss_integration_x86_64
265+
buildspec: tests/ci/codebuild/common/run_simple_target.yml
266+
env:
267+
type: LINUX_CONTAINER
268+
privileged-mode: false
269+
compute-type: BUILD_GENERAL1_SMALL
270+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
271+
variables:
272+
AWS_LC_CI_TARGET: "tests/ci/integration/run_tpm2_tss_integration.sh"
273+
274+
- identifier: tcpdump_integration_x86_64
275+
buildspec: tests/ci/codebuild/common/run_simple_target.yml
276+
env:
277+
type: LINUX_CONTAINER
278+
privileged-mode: false
279+
compute-type: BUILD_GENERAL1_SMALL
280+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
281+
variables:
282+
AWS_LC_CI_TARGET: "tests/ci/integration/run_tcpdump_integration.sh"
283+
284+
- identifier: socat_integration_x86_64
285+
buildspec: tests/ci/codebuild/common/run_nonroot_target.yml
286+
env:
287+
type: LINUX_CONTAINER
288+
privileged-mode: false
289+
compute-type: BUILD_GENERAL1_MEDIUM
290+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
291+
variables:
292+
AWS_LC_CI_TARGET: "tests/ci/integration/run_socat_integration.sh"
293+
LOGNAME: "postgres"
294+
295+
- identifier: openldap_integration_x86_64
296+
buildspec: tests/ci/codebuild/common/run_simple_target.yml
297+
env:
298+
type: LINUX_CONTAINER
299+
privileged-mode: false
300+
compute-type: BUILD_GENERAL1_MEDIUM
301+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
302+
variables:
303+
AWS_LC_CI_TARGET: "tests/ci/integration/run_openldap_integration.sh master OPENLDAP_REL_ENG_2_5"
304+
305+
- identifier: cyrus_sasl_integration_x86_64
306+
buildspec: tests/ci/codebuild/common/run_simple_target.yml
307+
env:
308+
type: LINUX_CONTAINER
309+
privileged-mode: false
310+
compute-type: BUILD_GENERAL1_SMALL
311+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
312+
variables:
313+
AWS_LC_CI_TARGET: "tests/ci/integration/run_cyrus_sasl_integration.sh"
314+
315+
- identifier: amazon_corretto_crypto_provider_integration_x86_64
316+
buildspec: tests/ci/codebuild/common/run_simple_target.yml
317+
env:
318+
type: LINUX_CONTAINER
319+
privileged-mode: false
320+
compute-type: BUILD_GENERAL1_2XLARGE
321+
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
322+
variables:
323+
AWS_LC_CI_TARGET: "tests/ci/integration/run_accp_integration.sh"

‎tests/ci/codebuild/common/run_simple_target.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ env:
1010
phases:
1111
build:
1212
commands:
13-
- "./${AWS_LC_CI_TARGET}"
13+
- ./${AWS_LC_CI_TARGET}

0 commit comments

Comments
 (0)