Changes from PR review

opendatahub-io · Nov 8, 2023 · 059c046 · 059c046
1 parent d897b9a
commit 059c046
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/pipelines/tekton/build-container-image-pipeline/build-container-image-pipeline.yaml b/pipelines/tekton/build-container-image-pipeline/build-container-image-pipeline.yaml
@@ -21,9 +21,7 @@ spec:
     type: string
   - name: modelRelativePath
     type: string
-  - name: fetch-git-model
-    type: string
-  - name: fetch-s3-model
+  - name: fetch-model
     type: string
   - name: git-model-repo
     type: string
@@ -36,7 +34,7 @@ spec:
       name: git-clone
     params:
     - name: url
-      value: $(params.git-model-repo) 
+      value: $(params.git-model-repo)
     - name: revision
       value: $(params.git-revision)
     - name: gitInitImage
@@ -47,9 +45,9 @@ spec:
     - name: output
       workspace: buildah-cache
     when:
-    - input: "$(params.fetch-git-model)"
+    - input: "$(params.fetch-model)"
       operator: in
-      values: ["true"]
+      values: ["git"]
   - name: kserve-download-model
     params:
     - name: model-name
@@ -67,25 +65,28 @@ spec:
     - name: aws-secret
       workspace: aws-secret
     when:
-    - input: "$(params.fetch-s3-model)"
+    - input: "$(params.fetch-model)"
       operator: in
-      values: ["true"]
+      values: ["s3"]
   - name: git-clone-containerfile-repo
     params:
-      - name: url
-        value: $(params.gitServer)/$(params.gitOrgName)/$(params.gitRepoName)
-      - name: gitInitImage
-        value: registry.redhat.io/openshift-pipelines/pipelines-git-init-rhel8@sha256:1a50511583fc02a27012d17d942e247813404104ddd282d7e26f99765174392c
-      - name: subdirectory
-        value: /containerfile_repo/
+    - name: url
+      value: $(params.gitServer)/$(params.gitOrgName)/$(params.gitRepoName)
+    - name: gitInitImage
+      value: registry.redhat.io/openshift-pipelines/pipelines-git-init-rhel8@sha256:1a50511583fc02a27012d17d942e247813404104ddd282d7e26f99765174392c
+    - name: subdirectory
+      value: /containerfile_repo/
     taskRef:
       kind: ClusterTask
       name: git-clone
     workspaces:
-      - name: output
-        workspace: buildah-cache
-      - name: basic-auth
-        workspace: git-basic-auth
+    - name: output
+      workspace: buildah-cache
+    - name: basic-auth
+      workspace: git-basic-auth
+    runAfter:
+    - kserve-download-model
+    - git-clone-model-repo
   - name: check-model-and-containerfile-exists
     params:
     - name: model-name
@@ -97,7 +98,7 @@ spec:
     - name: current-namespace
       value: $(context.pipelineRun.namespace)
     runAfter:
-      - git-clone-containerfile-repo
+    - git-clone-containerfile-repo
     taskRef:
       kind: Task
       name: check-model-and-containerfile-exists
@@ -112,7 +113,7 @@ spec:
     - name: VERSION
       value: latest
     runAfter:
-     - check-model-and-containerfile-exists
+    - check-model-and-containerfile-exists
     taskRef:
       kind: ClusterTask
       name: openshift-client

diff --git a/...tekton/build-container-image-pipeline/build-container-image-pipelinerun-bike-rentals.yaml b/...tekton/build-container-image-pipeline/build-container-image-pipelinerun-bike-rentals.yaml
@@ -20,10 +20,8 @@ spec:
     value: ai-edge
   - name: containerfileRelativePath
     value: pipelines/containerfiles/Containerfile.seldonio.mlserver.mlflow
-  - name: fetch-git-model
-    value: "true"
-  - name: fetch-s3-model
-    value: "false"
+  - name: fetch-model
+    value: "git"
   - name: git-model-repo
     value: https://github.com/opendatahub-io/ai-edge.git
   - name: modelRelativePath
@@ -33,7 +31,7 @@ spec:
   pipelineRef:
     name: build-container-image
   serviceAccountName: pipeline
-  timeout: 1h0m0s  
+  timeout: 1h0m0s
   workspaces:
   - name: buildah-cache
     persistentVolumeClaim: