fixes

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

.github/workflows/e2e-tests.yml

@@ -21,24 +21,21 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
-      # build binaries and image for e2e test (includes experimental features)
-      - name: Build controller image
-        run: make e2e-build
-      - name: Check for e2e fixture changes
-        run: |
-          JOB_ENV="UPDATE_FIXTURES=$(scripts/e2e_test_fixtures.sh --check)"
-          echo "${JOB_ENV}" >> $GITHUB_ENV
-          echo "${JOB_ENV}" >> $GITHUB_OUTPUT
-      - name: Build e2e fixtures if necessary
-        if: env.UPDATE_FIXTURES == 'true'
-        run: scripts/e2e_test_fixtures.sh
-      - name: Save images
+      # add the fixtures changed flag (UPDATE_FIXTURES) to the job output to others can use it
+      - name: Rebuild fixtures if necessary
         run: |
+          UPDATE_FIXTURES="$(scripts/e2e_test_fixtures.sh --check)"
           if [ "${UPDATE_FIXTURES}" == "true" ]; then
+            # rebuild fixtures and export the images to .tar.gz files with --save
             scripts/e2e_test_fixtures.sh --save
           fi
+
+      # build binaries and image for e2e test (includes experimental features)
+      - name: Build OLM Image
+        run: |
+          make e2e-build
           docker save quay.io/operator-framework/olm:local | gzip > olm-image.tar.gz
-      - name: Upload Docker images
+      - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: docker-images
@@ -147,4 +144,27 @@ jobs:
       if: ${{ needs.e2e.result == 'failure' }}
       run: |
         echo 'Failure: at least one e2e matrix job has failed'
-        exit 1
+        exit 1
+
+  publish-fixture-images:
+    if: ${{ needs.build.outputs.UPDATE_FIXTURES == 'true' && success() }}
+    needs: e2e-tests
+    runs-on: ubuntu-latest
+    steps:
+      # checkout code and setup go
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: docker-images
+          path: images/
+      - name: Load Docker images
+        run: |
+          for image in images/*.tar.gz; do
+            docker load -i $image
+          done
+      - name: Push fixture images
+        run: scripts/e2e_test_fixtures.sh --push --skip-build

scripts/e2e_test_fixtures.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -x
-
 # Load bingo tools for kind
 source .bingo/variables.env
 
@@ -14,8 +12,9 @@ SAVE=false
 CONTAINER_RUNTIME=docker
 REGISTRY=quay.io/olmtest
 TARGET_BRANCH=master
-JUST_CHECK=false
+CHECK=false
 LOAD_KIND=false
+BUILD=true
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -29,7 +28,7 @@ while [ $# -gt 0 ]; do
       ;;
     # check if images need to be updated - won't build or push images
     --check)
-      JUST_CHECK="true"
+      CHECK="true"
       ;;
     # container runtime to use, e.g. podman (default docker)
     --container-runtime=*)
@@ -49,11 +48,25 @@ while [ $# -gt 0 ]; do
     --save)
       SAVE="true"
       ;;
+    --skip-build)
+      BUILD="false"
+      ;;
     *)
       printf "*************************\n"
       printf "* Error: Invalid argument.\n"
       # shellcheck disable=SC2059
-      printf "* Usage: %s [--opm-version=version] [--push=true|false] [--container-runtime=runtime] [--registry=registry] [--target-branch=branch]\n" "$0"
+      printf "* Usage: %s [--opm-version=version] [--check] [--push] [--container-runtime=runtime] [--registry=registry] [--target-branch=branch] [--kind-load] [--save] [--skip-build] \n" "$0"
+      printf "\n"
+      printf "\t--opm-version: opm version to build the fixtures against, e.g. 1.39.0\n"
+      printf "\t--check: check if images need to be updated - won't build or push images\n"
+      printf "\t--push: push images to registry after build\n"
+      printf "\t--container-runtime: container runtime to use, e.g. podman (default docker)\n"
+      printf "\t--registry: registry to push images (default: quay.io/olmtest)\n"
+      printf "\t--target-branch: target branch to compare against when checking for changes (default: master)\n"
+      printf "\t--kind-load: load fixture images into kind cluster (default: false)\n"
+      printf "\t--save: save images to tar.gz files (default: false)\n"
+      printf "\t--skip-build: skip building images - useful if you just want to kind-load/save/push (default: false)\n"
+
       printf "*************************\n"
       exit 1
   esac
@@ -80,6 +93,8 @@ function check_changes() {
   fi
 }
 
+set -x
+
 # Fixtures
 BUNDLE_V1_IMAGE="${REGISTRY}/busybox-bundle:1.0.0-${OPM_VERSION}"
 BUNDLE_V1_DEP_IMAGE="${REGISTRY}/busybox-dependency-bundle:1.0.0-${OPM_VERSION}"
@@ -92,7 +107,7 @@ INDEX_V2="${REGISTRY}/busybox-dependencies-index:2.0.0-with-ListBundles-method-$
 TEST_CATALOG_IMAGE="${REGISTRY}/test-catalog:${OPM_VERSION}"
 
 # Prints true if changes are detected, false otherwise
-if [ "$JUST_CHECK" = true ]; then
+if [ "CHECK" = true ]; then
   check_changes
   exit 0
 fi
@@ -109,7 +124,26 @@ if [ "$LOAD_KIND" = true ]; then
   exit 0
 fi
 
-# Assumes images are already built
+if [ "$BUILD" = "true" ]; then
+  # Busybox Operator
+  # Build bundles
+  ${CONTAINER_RUNTIME} build -t "${BUNDLE_V1_IMAGE}" ./test/images/busybox-index/busybox/1.0.0
+  ${CONTAINER_RUNTIME} build -t "${BUNDLE_V1_DEP_IMAGE}" ./test/images/busybox-index/busybox-dependency/1.0.0
+  ${CONTAINER_RUNTIME} build -t "${BUNDLE_V2_IMAGE}" ./test/images/busybox-index/busybox/2.0.0
+  ${CONTAINER_RUNTIME} build -t "${BUNDLE_V2_DEP_IMAGE}" ./test/images/busybox-index/busybox-dependency/2.0.0
+
+
+  # Build catalogs
+  ${CONTAINER_RUNTIME} build -t "${INDEX_V1}" --build-arg="OPM_VERSION=v${OPM_VERSION}" --build-arg="CONFIGS_DIR=indexv1" ./test/images/busybox-index
+  ${CONTAINER_RUNTIME} build -t "${INDEX_V2}" --build-arg="OPM_VERSION=v${OPM_VERSION}" --build-arg="CONFIGS_DIR=indexv2" ./test/images/busybox-index
+
+  # The following catalog used for e2e tests related to serving an extracted registry
+  # See catalog_e2e_test.go
+  # let's just reuse one of the other catalogs for this - the tests don't care about the content
+  # only that a catalog's content can be extracted and served by a different container
+  ${CONTAINER_RUNTIME} tag "${INDEX_V2}" "${TEST_CATALOG_IMAGE}"
+fi
+
 if [ "${SAVE}" = true ]; then
   ${CONTAINER_RUNTIME} save "${BUNDLE_V1_IMAGE}" | gzip > bundlev1.tar.gz
   ${CONTAINER_RUNTIME} save "${BUNDLE_V1_DEP_IMAGE}" | gzip > bundlev1dep.tar.gz
@@ -121,23 +155,8 @@ if [ "${SAVE}" = true ]; then
   ${CONTAINER_RUNTIME} save "${INDEX_V2}" | gzip > indexv2.tar.gz
 
   ${CONTAINER_RUNTIME} save "${TEST_CATALOG_IMAGE}" | gzip > testcatalog.tar.gz
-  exit 0
 fi
 
-# Busybox Operator Index Image
-${CONTAINER_RUNTIME} build -t "${BUNDLE_V1_IMAGE}" ./test/images/busybox-index/busybox/1.0.0
-${CONTAINER_RUNTIME} build -t "${BUNDLE_V1_DEP_IMAGE}" ./test/images/busybox-index/busybox-dependency/1.0.0
-${CONTAINER_RUNTIME} build -t "${BUNDLE_V2_IMAGE}" ./test/images/busybox-index/busybox/2.0.0
-${CONTAINER_RUNTIME} build -t "${BUNDLE_V2_DEP_IMAGE}" ./test/images/busybox-index/busybox-dependency/2.0.0
-
-# Build catalog from templates
-${CONTAINER_RUNTIME} build -t "${INDEX_V1}" --build-arg="OPM_VERSION=v${OPM_VERSION}" --build-arg="CONFIGS_DIR=indexv1" ./test/images/busybox-index
-${CONTAINER_RUNTIME} build -t "${INDEX_V2}" --build-arg="OPM_VERSION=v${OPM_VERSION}" --build-arg="CONFIGS_DIR=indexv2" ./test/images/busybox-index
-
-# Test catalog used for e2e tests related to serving an extracted registry
-# Let's reuse one of the other indices for this
-${CONTAINER_RUNTIME} tag "${INDEX_V2}" "${TEST_CATALOG_IMAGE}"
-
 if [ "$PUSH" = true ]; then
   # push bundles
   ${CONTAINER_RUNTIME} push "${BUNDLE_V1_IMAGE}"