SLT-1026: In cicd images, upgrade helm-unittest plugin to the latest …

…version in the official repository.
wunderio · Jun 17, 2024 · 1544f12 · 1544f12
1 parent 4da247f
commit 1544f12
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 40 deletions.
diff --git a/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile
@@ -38,7 +38,7 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
   # && helm repo add minio https://helm.min.io/ \
   && helm repo add wunderio https://storage.googleapis.com/charts.wdr.io \
   && helm repo add percona https://percona.github.io/percona-helm-charts/ \
-  && helm plugin install https://github.com/quintush/helm-unittest --version 0.2.4
+  && helm plugin install https://github.com/helm-unittest/helm-unittest --version 0.5.1
 
 # Clean up
 RUN sudo apt-get clean autoclean -y \
@@ -51,11 +51,6 @@ RUN sudo apt-get clean autoclean -y \
 		/root/.cache /root/.local /root/.gnupg /root/.config \
     /tmp/*
 
-# NOTE: quintush/helm-unittest v0.2.0 release breaks helm tests.
-
-# TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
-# switch back to using https://github.com/lrills/helm-unittest as the source
-
 # Install Node.js and Yarn.
 # The following code is based on the CircleCI Node.js Dockerfile template:
 # https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template

diff --git a/silta-cicd/circleci-php8.0-node16-composer2/TAGS b/silta-cicd/circleci-php8.0-node16-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.0-node16-composer2-v1
-circleci-php8.0-node16-composer2-v1.5
-circleci-php8.0-node16-composer2-v1.5.0
+circleci-php8.0-node16-composer2-v1.6
+circleci-php8.0-node16-composer2-v1.6.0
diff --git a/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
@@ -45,12 +45,7 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
   # && helm repo add minio https://helm.min.io/ \
   && helm repo add wunderio https://storage.googleapis.com/charts.wdr.io \
   && helm repo add percona https://percona.github.io/percona-helm-charts/ \
-  && helm plugin install https://github.com/quintush/helm-unittest --version 0.2.4
-
-# NOTE: quintush/helm-unittest v0.2.0 release breaks helm tests.
-
-# TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
-# switch back to using https://github.com/lrills/helm-unittest as the source
+  && helm plugin install https://github.com/helm-unittest/helm-unittest --version 0.5.1
 
 # Install Node.js and Yarn.
 # The following code is based on the CircleCI Node.js Dockerfile template:

diff --git a/silta-cicd/circleci-php8.1-node16-composer2/TAGS b/silta-cicd/circleci-php8.1-node16-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.1-node16-composer2-v1
-circleci-php8.1-node16-composer2-v1.4
-circleci-php8.1-node16-composer2-v1.4.0
+circleci-php8.1-node16-composer2-v1.5
+circleci-php8.1-node16-composer2-v1.5.0
diff --git a/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
@@ -44,12 +44,7 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
   # && helm repo add minio https://helm.min.io/ \
   && helm repo add wunderio https://storage.googleapis.com/charts.wdr.io \
   && helm repo add percona https://percona.github.io/percona-helm-charts/ \
-  && helm plugin install https://github.com/quintush/helm-unittest --version 0.2.4
-
-# NOTE: quintush/helm-unittest v0.2.0 release breaks helm tests.
-
-# TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
-# switch back to using https://github.com/lrills/helm-unittest as the source
+  && helm plugin install https://github.com/helm-unittest/helm-unittest --version 0.5.1
 
 # Install Node.js and Yarn.
 # The following code is based on the CircleCI Node.js Dockerfile template:

diff --git a/silta-cicd/circleci-php8.1-node18-composer2/TAGS b/silta-cicd/circleci-php8.1-node18-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.1-node18-composer2-v1
-circleci-php8.1-node18-composer2-v1.4
-circleci-php8.1-node18-composer2-v1.4.0
+circleci-php8.1-node18-composer2-v1.5
+circleci-php8.1-node18-composer2-v1.5.0
diff --git a/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
@@ -44,12 +44,7 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
   # && helm repo add minio https://helm.min.io/ \
   && helm repo add wunderio https://storage.googleapis.com/charts.wdr.io \
   && helm repo add percona https://percona.github.io/percona-helm-charts/ \
-  && helm plugin install https://github.com/quintush/helm-unittest --version 0.2.4
-
-# NOTE: quintush/helm-unittest v0.2.0 release breaks helm tests.
-
-# TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
-# switch back to using https://github.com/lrills/helm-unittest as the source
+  && helm plugin install https://github.com/helm-unittest/helm-unittest --version 0.5.1
 
 # Install Node.js and Yarn.
 # The following code is based on the CircleCI Node.js Dockerfile template:

diff --git a/silta-cicd/circleci-php8.2-node18-composer2/TAGS b/silta-cicd/circleci-php8.2-node18-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.2-node18-composer2-v1
-circleci-php8.2-node18-composer2-v1.4
-circleci-php8.2-node18-composer2-v1.4.0
+circleci-php8.2-node18-composer2-v1.5
+circleci-php8.2-node18-composer2-v1.5.0
diff --git a/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile
@@ -44,12 +44,7 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
   # && helm repo add minio https://helm.min.io/ \
   && helm repo add wunderio https://storage.googleapis.com/charts.wdr.io \
   && helm repo add percona https://percona.github.io/percona-helm-charts/ \
-  && helm plugin install https://github.com/quintush/helm-unittest --version 0.2.4
-
-# NOTE: quintush/helm-unittest v0.2.0 release breaks helm tests.
-
-# TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
-# switch back to using https://github.com/lrills/helm-unittest as the source
+  && helm plugin install https://github.com/helm-unittest/helm-unittest --version 0.5.1
 
 # Install Node.js and Yarn.
 # The following code is based on the CircleCI Node.js Dockerfile template:

diff --git a/silta-cicd/circleci-php8.2-node20-composer2/TAGS b/silta-cicd/circleci-php8.2-node20-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.2-node20-composer2-v1
-circleci-php8.2-node20-composer2-v1.3
-circleci-php8.2-node20-composer2-v1.3.0
+circleci-php8.2-node20-composer2-v1.4
+circleci-php8.2-node20-composer2-v1.4.0