Parameterize CE_VERSION

Signed-off-by: Oz Tiram <[email protected]>
spectrocloud · Jan 10, 2024 · e479c83 · e479c83
1 parent 5ab6bfc
commit e479c83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/test/env.example b/test/env.example
@@ -30,6 +30,7 @@ export EARTHLY_BUILDKIT_CACHE_SIZE_MB=100000
 export OCI_REGISTRY=${OCI_REGISTRY:-ttl.sh}
 export STYLUS_BRANCH=${STYLUS_BRANCH:-two-node}
 export PROVIDER_K3S_BRANCH=${PROVIDER_K3S_BRANCH:-2-node-health-checks}
+export PE_VERSION="4.1.2"
 
 # two node vars
 export TWO_NODE_BACKEND=postgres # one of: [ postgres | sqlite ]
diff --git a/test/test-two-node.sh b/test/test-two-node.sh
@@ -378,9 +378,10 @@ function build_canvos() {
         --IMAGE_REGISTRY=${OCI_REGISTRY} \
         --TWO_NODE=true \
         --TWO_NODE_BACKEND=${TWO_NODE_BACKEND} \
-        --CUSTOM_TAG=${STYLUS_HASH}
-    docker push ${OCI_REGISTRY}/ubuntu:k3s-1.26.4-v4.1.2-${STYLUS_HASH}
-    docker push ${OCI_REGISTRY}/ubuntu:k3s-1.27.2-v4.1.2-${STYLUS_HASH}
+        --CUSTOM_TAG=${STYLUS_HASH} \
+	--PE_VERSION=v${PE_VERSION}
+    docker push ${OCI_REGISTRY}/ubuntu:k3s-1.26.4-v${PE_VERSION}-${STYLUS_HASH}
+    docker push ${OCI_REGISTRY}/ubuntu:k3s-1.27.2-v${PE_VERSION}-${STYLUS_HASH}
 }
 
 function build_all() {
@@ -408,7 +409,7 @@ function build_all() {
     (
         test -f build/palette-edge-installer-stylus-${STYLUS_HASH}-k3s-${PROVIDER_K3S_HASH}.iso && \
         docker image ls --format "{{.Repository}}:{{.Tag}}" | \
-        grep -q ${OCI_REGISTRY}/ubuntu:k3s-1.26.4-v4.1.2-${STYLUS_HASH}
+        grep -q ${OCI_REGISTRY}/ubuntu:k3s-1.26.4-v${PE_VERSION}-${STYLUS_HASH}
     ) || ( build_canvos )
 }