Skip to content

Commit 2afb605

Browse files
coderbirjucoderbirju
committed
add codebuild specific changes to workflows
Signed-off-by: Arjun Raja Yogidas <[email protected]>
1 parent ec897a7 commit 2afb605

File tree

6 files changed

+53
-16
lines changed

6 files changed

+53
-16
lines changed

‎.github/workflows/benchmark_visualization.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ env:
1717

1818
jobs:
1919
benchmark:
20-
runs-on: codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
20+
# skip running benchmarks in forks
21+
if: ${{ github.repository == 'awslabs/soci-snapshotter' }}
22+
runs-on: codebuild-soci-snapshotter-benchmark-visualization-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
2123
steps:
2224
- name: Checkout main branch
2325
uses: actions/checkout@v4
@@ -37,7 +39,8 @@ jobs:
3739
path: ${{github.workspace}}/benchmark/performanceTest/output/results.json
3840

3941
download-and-convert-benchmark-result-to-visualization-data:
40-
runs-on: codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
42+
if: ${{ github.repository == 'awslabs/soci-snapshotter' }}
43+
runs-on: codebuild-soci-snapshotter-benchmark-visualization-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
4144
needs: benchmark
4245
steps:
4346
- name: Checkout main branch
@@ -66,8 +69,9 @@ jobs:
6669
matrix: ${{ steps.set-matrix.outputs.files }}
6770

6871
push-benchmark-result-gh-pages:
72+
if: ${{ github.repository == 'awslabs/soci-snapshotter' }}
6973
name: Push benchmark result to Github-pages
70-
runs-on: codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
74+
runs-on: codebuild-soci-snapshotter-benchmark-visualization-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
7175
needs: download-and-convert-benchmark-result-to-visualization-data
7276
strategy:
7377
matrix:

‎.github/workflows/build.yml

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,21 @@ env:
2323
GO_VERSION: '1.21.10'
2424

2525
jobs:
26+
test-codebuild:
27+
# Run also in codebuild to catch any issues with different kernel versions
28+
if: ${{ github.repository == 'awslabs/soci-snapshotter' }}
29+
runs-on: codebuild-soci-snapshotter-build-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
30+
timeout-minutes: 15
31+
steps:
32+
- uses: actions/checkout@v4
33+
- uses: actions/setup-go@v5
34+
with:
35+
go-version: ${{ env.GO_VERSION }}
36+
- run: make
37+
- run: make test
38+
2639
test:
27-
runs-on: codebuild-soci-build-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
40+
runs-on: ubuntu-22.04
2841
timeout-minutes: 15
2942
steps:
3043
- uses: actions/checkout@v4
@@ -33,8 +46,10 @@ jobs:
3346
go-version: ${{ env.GO_VERSION }}
3447
- run: make
3548
- run: make test
36-
integration:
37-
runs-on: codebuild-soci-build-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
49+
50+
integration-codebuild:
51+
if: ${{ github.repository == 'awslabs/soci-snapshotter' }}
52+
runs-on: codebuild-soci-snapshotter-build-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
3853
timeout-minutes: 40
3954
strategy:
4055
fail-fast: false
@@ -48,3 +63,19 @@ jobs:
4863
with:
4964
go-version: ${{ env.GO_VERSION }}
5065
- run: make integration
66+
67+
integration:
68+
runs-on: ubuntu-22.04
69+
timeout-minutes: 40
70+
strategy:
71+
fail-fast: false
72+
matrix:
73+
containerd: ["1.6.30", "1.7.14"]
74+
env:
75+
DOCKER_BUILD_ARGS: "CONTAINERD_VERSION=${{ matrix.containerd }}"
76+
steps:
77+
- uses: actions/checkout@v4
78+
- uses: actions/setup-go@v5
79+
with:
80+
go-version: ${{ env.GO_VERSION }}
81+
- run: make integration

‎.github/workflows/bump-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
# Don't bother bumping deps on forks.
2222
if: ${{ github.repository == 'awslabs/soci-snapshotter' || github.event_name == 'workflow_dispatch' }}
23-
runs-on: codebuild-soci-bump-dependencies-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-medium
23+
runs-on: ubuntu-22.04
2424

2525
steps:
2626
- uses: actions/checkout@v4

‎.github/workflows/comparision-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ env:
99

1010
jobs:
1111
check:
12-
runs-on: codebuild-soci-comparision-test-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
12+
if: ${{ github.repository == 'awslabs/soci-snapshotter' }}
13+
runs-on: codebuild-soci-snapshotter-comparison-test-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
1314
steps:
1415
- uses: actions/checkout@v4
1516
- uses: actions/setup-go@v5

‎.github/workflows/prebuild.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212

1313
jobs:
1414
check:
15-
runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small
15+
runs-on: ubuntu-22.04
1616
steps:
1717
- uses: actions/checkout@v4
1818
with:
@@ -32,7 +32,7 @@ jobs:
3232
- run: PATH=$PATH:$(pwd) ./scripts/check-flatc.sh
3333

3434
git-secrets:
35-
runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small
35+
runs-on: ubuntu-22.04
3636
steps:
3737
- name: Pull latest awslabs/git-secrets repo
3838
uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
matrix:
5656
working_dir: ['.', 'cmd']
57-
runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small
57+
runs-on: ubuntu-22.04
5858
steps:
5959
- uses: actions/checkout@v4
6060
- uses: golangci/golangci-lint-action@v6
@@ -64,13 +64,14 @@ jobs:
6464

6565
yamllint:
6666
name: yamllint-lint
67-
runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small
67+
runs-on: ubuntu-22.04
6868
steps:
6969
- uses: actions/checkout@v4
70+
- run: pip install yamllint
7071
- run: yamllint .
7172

7273
shellcheck:
73-
runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small
74+
runs-on: ubuntu-22.04
7475
container: koalaman/shellcheck-alpine:v0.10.0
7576
steps:
7677
- uses: actions/checkout@v4

‎.github/workflows/releases.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions:
2020

2121
jobs:
2222
generate-artifacts:
23-
runs-on: codebuild-soci-release-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
23+
runs-on: ubuntu-22.04
2424
env:
2525
# Set during setup.
2626
RELEASE_TAG: ''
@@ -60,7 +60,7 @@ jobs:
6060

6161
validate-artifacts:
6262
needs: generate-artifacts
63-
runs-on: codebuild-soci-release-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
63+
runs-on: ubuntu-22.04
6464
steps:
6565
- uses: actions/checkout@v4
6666
- uses: actions/download-artifact@v4
@@ -72,7 +72,7 @@ jobs:
7272
create-release:
7373
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
7474
needs: [generate-artifacts, validate-artifacts]
75-
runs-on: codebuild-soci-release-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
75+
runs-on: ubuntu-22.04
7676
steps:
7777
- uses: actions/checkout@v4
7878
- uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)