Run e2e-olm on config changes

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
controlplaneio-fluxcd · Jun 17, 2024 · c0d1314 · c0d1314
1 parent a8b757c
commit c0d1314
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/e2e-olm.yml b/.github/workflows/e2e-olm.yml
@@ -2,6 +2,12 @@ name: e2e-olm
 
 on:
   workflow_dispatch:
+  push:
+    branches: [ '*' ]
+    paths:
+    - 'config/olm/**'
+    - 'test/olm/**'
+    - '.github/workflows/e2e-olm.yml'
 
 permissions:
   contents: read
@@ -38,5 +44,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Run OLM tests
-        run: |
-          make test-olm
+        run: make test-olm
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/config/olm/bundle/manifests/flux-operator.clusterserviceversion.yaml b/config/olm/bundle/manifests/flux-operator.clusterserviceversion.yaml
@@ -61,9 +61,11 @@ spec:
     For more information about the CNCF Flux project, please see
     the [Flux architecture overview](https://fluxcd.control-plane.io/guides/flux-architecture/).
 
-    The [Flux Operator](https://github.com/controlplaneio-fluxcd) provides a
+    The [Flux Operator](https://github.com/controlplaneio-fluxcd/flux-operator) provides a
     declarative API for the installation, configuration and upgrade of CNCF Flux
     and the ControlPlane [enterprise distribution](https://fluxcd.control-plane.io/).
+    The operator allows the configuration of Flux multi-tenancy lockdown, vertical scaling, persistent storage,
+    and the syncing of the cluster state from Git repositories, OCI artifacts and S3-compatible storage.
     
     ### OpenShift Support
     

diff --git a/hack/build-olm-images.sh b/hack/build-olm-images.sh
@@ -50,10 +50,10 @@ docker run --rm --privileged \
   opm:latest index add \
   --container-tool docker \
   --bundles ${OCI_IMAGE}-catalog:bundle-"${VERSION}" \
-  --tag ${OCI_IMAGE}-index:${VERSION}
+  --tag ${OCI_IMAGE}-index:v${VERSION}
 
 # push index image
-docker push ${OCI_IMAGE}-index:${VERSION}
+docker push ${OCI_IMAGE}-index:v${VERSION}
 
 info "OLM catalog pushed to ${OCI_IMAGE}-catalog:bundle-${VERSION}"
-info "OLM index pushed to ${OCI_IMAGE}-index:${VERSION}"
+info "OLM index pushed to ${OCI_IMAGE}-index:v${VERSION}"
diff --git a/test/olm/e2e_test.go b/test/olm/e2e_test.go
@@ -47,7 +47,7 @@ var _ = BeforeSuite(func() {
 	}
 
 	img = fmt.Sprintf("%s-catalog:bundle-%s", olmArtifactPrefix, version)
-	opm := fmt.Sprintf("%s-index:%s", olmArtifactPrefix, version)
+	opm := fmt.Sprintf("%s-index:v%s", olmArtifactPrefix, version)
 
 	By("loading the flux-operator bundle image on Kind")
 	err := utils.LoadImageToKindClusterWithName(img, "/test/olm")