fix(test): update toolchain image/script (#1189)

update the toolchain image and update the script to be able to specify the url of public container registry and scripts Signed-off-by: Yihong Wang <[email protected]>
kubeflow · Mar 16, 2023 · 7414106 · 7414106
1 parent 3b006b9
commit 7414106
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 77 deletions.
diff --git a/.tekton/listener.yaml b/.tekton/listener.yaml
@@ -30,10 +30,13 @@ spec:
       default: iamapikey
     - name: docker-password
       description: iam api key
-    - name: dockerhub-username
+    - name: public-cr-username
       description: username for docker hub
-    - name: dockerhub-password
-      description: dockerhub password/token
+    - name: public-cr-password
+      description: password/token for public container registry
+    - name: public-cr
+      description: public container registry
+      default: docker.io
     - name: tekton-version
       description: tekton version
     - name: tekton-ns
@@ -50,20 +53,20 @@ spec:
     - name: slack-channel
       description: slack channel
       default: ""
-    - name: publish-to-dockerhub
-      description: publish images to dockerhub
+    - name: publish-to-public-cr
+      description: publish images to public container registry
       default: "0"
     - name: extra-test-cases
-      description: publish images to dockerhub
+      description: run extra test cases
       default: "0"
     - name: skip-pipeline-loop
       descript: skip the pipeline loop test case
       default: "0"
     - name: image-tag
       description: image tag
       default: "nightly"
-    - name: dockerhub-namespace
-      description: dockerhub namespace
+    - name: public-cr-namespace
+      description: namespace for public container registry
       default: aipipeline
     - name: images
       description: a image list for publishing
@@ -108,10 +111,10 @@ spec:
           value: $(params.docker-username)
         - name: docker-password
           value: $(params.docker-password)
-        - name: dockerhub-username
-          value: $(params.dockerhub-username)
-        - name: dockerhub-password
-          value: $(params.dockerhub-password)
+        - name: public-cr-username
+          value: $(params.public-cr-username)
+        - name: public-cr-password
+          value: $(params.public-cr-password)
         - name: resource-group
           value: $(params.resource-group)
         - name: org
@@ -132,10 +135,12 @@ spec:
           value: $(params.slack-channel)
         - name: image-tag
           value: $(params.image-tag)
-        - name: dockerhub-namespace
-          value: $(params.dockerhub-namespace)
-        - name: publish-to-dockerhub
-          value: $(params.publish-to-dockerhub)
+        - name: public-cr
+          value: $(params.public-cr)
+        - name: public-cr-namespace
+          value: $(params.public-cr-namespace)
+        - name: publish-to-public-cr
+          value: $(params.publish-to-public-cr)
         - name: extra-test-cases
           value: $(params.extra-test-cases)
         - name: skip-pipeline-loop

diff --git a/.tekton/pipeline.yaml b/.tekton/pipeline.yaml
@@ -20,10 +20,13 @@ spec:
       default: iamapikey
     - name: docker-password
       description: iam api key
-    - name: dockerhub-username
-      description: dockerhub username
-    - name: dockerhub-password
-      description: dockerhub password/token
+    - name: public-cr-username
+      description: username for public container registry
+    - name: public-cr-password
+      description: password/token for public container registry
+    - name: public-cr
+      description: public container registry
+      default: docker.io
     - name: resource-group
       description: resource group
       default: default
@@ -49,8 +52,8 @@ spec:
     - name: slack-channel
       description: slack channel
       default: ""
-    - name: publish-to-dockerhub
-      description: publish images to dockerhub
+    - name: publish-to-public-cr
+      description: publish images to public container registry
       default: "0"
     - name: extra-test-cases
       description: execute extra test cases
@@ -61,8 +64,8 @@ spec:
     - name: image-tag
       description: image tag
       default: "nightly"
-    - name: dockerhub-namespace
-      description: dockerhub namespace
+    - name: public-cr-namespace
+      description: namespace for public container registry
       default: aipipeline
     - name: images
       description: a image list for publishing
@@ -471,6 +474,8 @@ spec:
           value: $(params.kubernetes-cluster)
         - name: kubeflow-ns
           value: $(params.kubeflow-ns)
+        - name: public-cr
+          value: $(params.public-cr)
         # - name: tekton-version
         #   value: $(params.tekton-version)
         # - name: tekton-ns
@@ -712,7 +717,7 @@ spec:
         - deploy-any-sequencer-e2e
         - deploy-kubectl-wrapper-e2e
       when:
-        - input: $(params.publish-to-dockerhub)
+        - input: $(params.publish-to-public-cr)
           operator: in
           values:
             - '1'
@@ -731,14 +736,16 @@ spec:
           value: $(params.docker-username)
         - name: docker-password
           value: $(params.docker-password)
-        - name: dockerhub-username
-          value: $(params.dockerhub-username)
-        - name: dockerhub-password
-          value: $(params.dockerhub-password)
+        - name: public-cr-username
+          value: $(params.public-cr-username)
+        - name: public-cr-password
+          value: $(params.public-cr-password)
         - name: image-tag
           value: $(params.image-tag)
-        - name: dockerhub-namespace
-          value: $(params.dockerhub-namespace)
+        - name: public-cr-namespace
+          value: $(params.public-cr-namespace)
+        - name: public-cr
+          value: $(params.public-cr)
         - name: images
           value: $(params.images)
       workspaces:

diff --git a/.tekton/task.yaml b/.tekton/task.yaml
@@ -35,7 +35,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: run-go-unittests
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: DOCKER_USERNAME
           value: $(params.docker-username)
@@ -104,7 +104,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: build-image
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: DOCKER_USERNAME
           value: $(params.docker-username)
@@ -170,7 +170,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: build-image
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: DOCKER_USERNAME
           value: $(params.docker-username)
@@ -240,7 +240,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: build-image
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: DOCKER_USERNAME
           value: $(params.docker-username)
@@ -342,6 +342,9 @@ spec:
       default: iamapikey
     - name: docker-password
       description: iam api key
+    - name: public-cr
+      description: public container registry
+      default: quay.io
     - name: archive-dir
       description: archive directory
       default: "."
@@ -350,14 +353,16 @@ spec:
     mountPath: /artifacts
   steps:
     - name: deploy-kfp-tekton
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.5
       env:
         - name: DOCKER_USERNAME
           value: $(params.docker-username)
         - name: DOCKER_PASSWORD
           value: $(params.docker-password)
         - name: IBM_CLOUD_API_KEY
           value: $(params.apikey)
+        - name: PUBLIC_CR
+          value: $(param.public-cr)
         - name: PIPELINE_KUBERNETES_CLUSTER_NAME
           value: $(params.kubernetes-cluster)
         - name: ARCHIVE_DIR
@@ -400,7 +405,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: run-test
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: IBM_CLOUD_API_KEY
           value: $(params.apikey)
@@ -451,10 +456,13 @@ spec:
       description: ibm container registry username
     - name: docker-password
       description: ibm container registry password
-    - name: dockerhub-username
-      description: dockerhub username
-    - name: dockerhub-password
-      description: dockerhub password/token
+    - name: public-cr-username
+      description: username for public container registry
+    - name: public-cr-password
+      description: password/token for public container registry
+    - name: public-cr
+      description: public conainer registry uri
+      default: docker.io
     - name: images
       description: image list to publish
       default: "api-server persistenceagent metadata-writer scheduledworkflow cache-server frontend"
@@ -464,15 +472,15 @@ spec:
     - name: dind-ns
       description: dind namespace
       default: docker-build
-    - name: dockerhub-namespace
-      description: dockerhub namespace
+    - name: public-cr-namespace
+      description: namespace for public container registry
       default: aipipeline
   workspaces:
   - name: task-pvc
     mountPath: /artifacts
   steps:
-    - name: publish-images-to-dockerhub
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+    - name: publish-images-to-cr
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: IBM_CLOUD_API_KEY
           value: $(params.apikey)
@@ -488,12 +496,14 @@ spec:
           value: $(params.docker-username)
         - name: DOCKER_PASSWORD
           value: $(params.docker-password)
-        - name: DOCKERHUB_USERNAME
-          value: $(params.dockerhub-username)
-        - name: DOCKERHUB_TOKEN
-          value: $(params.dockerhub-password)
-        - name: DOCKERHUB_NAMESPACE
-          value: $(params.dockerhub-namespace)
+        - name: PUBLIC_CR_USERNAME
+          value: $(params.public-cr-username)
+        - name: PUBLIC_CR_TOKEN
+          value: $(params.public-cr-password)
+        - name: PUBLIC_CR_NAMESPACE
+          value: $(params.public-cr-namespace)
+        - name: PUBLIC_CR
+          value: $(params.public-cr)
         - name: IMAGES
           value: $(params.images)
         - name: PUBLISH_TAG
@@ -577,7 +587,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: undeploy-kfp-tekton
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.5
       env:
         - name: PIPELINE_KUBERNETES_CLUSTER_NAME
           value: $(params.kubernetes-cluster)
@@ -607,7 +617,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: build-binaries
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: BUILD_DIR
           value: $(params.build-dir)
@@ -629,7 +639,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: setup-deploy
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       command:
         - /bin/bash
         - '-c'
@@ -651,7 +661,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: setup-deploy
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       command:
         - /bin/bash
         - '-c'
@@ -694,7 +704,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: iks-script
-      image: docker.io/aipipeline/pipeline-base-image:1.5
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: IBM_CLOUD_API_KEY
           value: $(params.apikey)

diff --git a/.tekton/tekton-catalog/tasks.yaml b/.tekton/tekton-catalog/tasks.yaml
@@ -18,7 +18,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: build-binaries
-      image: docker.io/aipipeline/pipeline-base-image:1.0
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: BUILD_DIR
           value: $(params.build-dir)
@@ -95,7 +95,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: create-docker-registry-secret
-      image: docker.io/aipipeline/pipeline-base-image:1.0
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: API_KEY
           valueFrom:
@@ -133,7 +133,7 @@ spec:
         - mountPath: /steps
           name: steps-volume
     - name: run-docker-commands
-      image: docker.io/aipipeline/pipeline-base-image:1.0
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: DOCKER_HOST
           value: "tcp://localhost:2376"
@@ -243,7 +243,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: cleanup
-      image: docker.io/aipipeline/pipeline-base-image:1.0
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: API_KEY
           valueFrom:
@@ -293,7 +293,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: setup-deploy
-      image: docker.io/aipipeline/pipeline-base-image:1.0
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: CONTROLLER_IMAGE_URL
           value: $(params.controller-image-url)
@@ -336,7 +336,7 @@ spec:
     mountPath: /artifacts
   steps:
     - name: setup-deploy
-      image: docker.io/aipipeline/pipeline-base-image:1.0
+      image: quay.io/aipipeline/pipeline-base-image:1.6
       env:
         - name: KUBECTL_WRAPPER_IMAGE_URL
           value: $(params.kubectl-wrapper-image-url)