From bf640262105d9d6402a7f32505479844b6f0b60f Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Tue, 7 Nov 2023 19:48:32 -0500 Subject: [PATCH 1/2] test(smoketest): use updated cryostat3 container image tag --- smoketest/compose/cryostat.yml | 2 +- smoketest/compose/cryostat_docker.yml | 2 +- smoketest/compose/cryostat_k8s.yml | 4 ++-- smoketest/k8s/cryostat-deployment.yaml | 2 +- smoketest/k8s/smoketest.bash | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/smoketest/compose/cryostat.yml b/smoketest/compose/cryostat.yml index 5ad43abdf..f7c3c285f 100644 --- a/smoketest/compose/cryostat.yml +++ b/smoketest/compose/cryostat.yml @@ -11,7 +11,7 @@ services: limits: cpus: '0.5' memory: 512m - image: quay.io/cryostat/cryostat3:dev + image: quay.io/cryostat/cryostat:3.0.0-snapshot volumes: - ${XDG_RUNTIME_DIR}/podman/podman.sock:/run/user/0/podman/podman.sock:Z security_opt: diff --git a/smoketest/compose/cryostat_docker.yml b/smoketest/compose/cryostat_docker.yml index 99692e079..9a35f25b3 100644 --- a/smoketest/compose/cryostat_docker.yml +++ b/smoketest/compose/cryostat_docker.yml @@ -11,7 +11,7 @@ services: limits: cpus: '0.5' memory: 512m - image: quay.io/cryostat/cryostat3:dev + image: quay.io/cryostat/cryostat:3.0.0-snapshot volumes: - /var/run/docker.sock:/var/run/docker.sock:Z security_opt: diff --git a/smoketest/compose/cryostat_k8s.yml b/smoketest/compose/cryostat_k8s.yml index 7add73323..4da589f30 100644 --- a/smoketest/compose/cryostat_k8s.yml +++ b/smoketest/compose/cryostat_k8s.yml @@ -6,7 +6,7 @@ services: condition: service_healthy s3: condition: service_healthy - image: quay.io/cryostat/cryostat3:dev + image: quay.io/cryostat/cryostat:3.0.0-snapshot hostname: cryostat3 user: "0" expose: @@ -29,4 +29,4 @@ services: interval: 10s retries: 3 start_period: 10s - timeout: 5s \ No newline at end of file + timeout: 5s diff --git a/smoketest/k8s/cryostat-deployment.yaml b/smoketest/k8s/cryostat-deployment.yaml index 2db623091..44e4670e2 100644 --- a/smoketest/k8s/cryostat-deployment.yaml +++ b/smoketest/k8s/cryostat-deployment.yaml @@ -66,7 +66,7 @@ spec: value: "true" - name: STORAGE_BUCKETS_ARCHIVES_NAME value: archivedrecordings - image: quay.io/cryostat/cryostat3:dev + image: quay.io/cryostat/cryostat:3.0.0-snapshot livenessProbe: exec: command: diff --git a/smoketest/k8s/smoketest.bash b/smoketest/k8s/smoketest.bash index 641a3a478..6a795be00 100755 --- a/smoketest/k8s/smoketest.bash +++ b/smoketest/k8s/smoketest.bash @@ -40,7 +40,7 @@ while [ "$#" -ne 0 ]; do --for condition=available \ --timeout=5m \ deployment db - kubectl patch -p "{\"spec\":{\"template\":{\"spec\":{\"\$setElementOrder/containers\":[{\"name\":\"cryostat\"}],\"containers\":[{\"image\":\"quay.io/$IMAGE_REPOSITORY/cryostat3:dev\",\"name\":\"cryostat\"}]}}}}" deployment/cryostat + kubectl patch -p "{\"spec\":{\"template\":{\"spec\":{\"\$setElementOrder/containers\":[{\"name\":\"cryostat\"}],\"containers\":[{\"image\":\"quay.io/$IMAGE_REPOSITORY/cryostat:3.0.0-snapshot\",\"name\":\"cryostat\"}]}}}}" deployment/cryostat kubectl wait \ --for condition=available \ --timeout=5m \ From e3752fa3a7cfeb93a4550f19aeacf00cfe29b865 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Tue, 7 Nov 2023 19:49:26 -0500 Subject: [PATCH 2/2] remove explicit kind image load --- smoketest/k8s/smoketest.bash | 1 - 1 file changed, 1 deletion(-) diff --git a/smoketest/k8s/smoketest.bash b/smoketest/k8s/smoketest.bash index 6a795be00..66e3929da 100755 --- a/smoketest/k8s/smoketest.bash +++ b/smoketest/k8s/smoketest.bash @@ -17,7 +17,6 @@ while [ "$#" -ne 0 ]; do kind) cleanKind kind create cluster - kind load docker-image "quay.io/${IMAGE_REPOSITORY}/cryostat3:dev" ;; unkind) cleanKind