Skip to content

Commit 17da4ed

Browse files
author
Per Goncalves da Silva
committed
update e2e gha
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 4ade1d9 commit 17da4ed

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

.github/workflows/e2e-tests.yml

+18-15
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,22 @@ jobs:
1313
# Build the OLM image and save it as an artifact
1414
build:
1515
runs-on: ubuntu-latest
16-
outputs:
17-
sha: ${{ steps.vars.outputs.sha }}
1816
steps:
1917
# checkout code and setup go
2018
- uses: actions/checkout@v4
2119
- uses: actions/setup-go@v5
2220
with:
2321
go-version-file: "go.mod"
2422
# build binaries and image for e2e test (includes experimental features)
25-
- name: Build controller image
26-
run: make e2e-build
27-
- name: Save image
28-
run: docker save quay.io/operator-framework/olm:local -o olm-image.tar
29-
- name: Upload Docker image as artifact
23+
- name: Build OLM Image
24+
run: |
25+
make e2e-build
26+
docker save quay.io/operator-framework/olm:local | gzip > olm-image.tar.gz
27+
- name: Upload Artifacts
3028
uses: actions/upload-artifact@v4
3129
with:
32-
name: olm-image.tar
33-
path: olm-image.tar
30+
name: docker-images
31+
path: "*.tar.gz"
3432

3533
# Run e2e tests in parallel jobs
3634
# Take olm image from the previous stage
@@ -54,13 +52,18 @@ jobs:
5452
with:
5553
go-version-file: "go.mod"
5654

57-
# load the olm image
58-
- name: Load OLM Docker image
55+
# load images into kind
56+
- name: Download build artifacts
5957
uses: actions/download-artifact@v4
6058
with:
61-
name: olm-image.tar
62-
path: .
63-
- run: docker load < olm-image.tar
59+
name: docker-images
60+
path: images/
61+
- name: Load Docker images
62+
run: |
63+
for image in images/*.tar.gz; do
64+
echo "Loading image $image"
65+
docker load -i $image
66+
done
6467
6568
# set e2e environment variables
6669
# Set ginkgo output and parallelism
@@ -87,7 +90,7 @@ jobs:
8790
KIND_CLUSTER_NAME="kind-olmv0-${i}" \
8891
KIND_CREATE_OPTS="--kubeconfig=${E2E_KUBECONFIG_ROOT}/kubeconfig-${i}" \
8992
HELM_INSTALL_OPTS="--kubeconfig ${E2E_KUBECONFIG_ROOT}/kubeconfig-${i}" \
90-
make kind-create deploy;
93+
make kind-create load-test-images deploy;
9194
done
9295
9396
# run non-flakes if matrix-id is not 'flakes'

0 commit comments

Comments
 (0)