test platform changed from gcp to aws for modelmesh

Signed-off-by: jooho <jlee@redhat.com>
openshift · Sep 16, 2023 · 58ea53a · 58ea53a
1 parent fe3b1c7
commit 58ea53a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/...onfig/opendatahub-io/modelmesh-serving/opendatahub-io-modelmesh-serving-release-0.11.yaml b/...onfig/opendatahub-io/modelmesh-serving/opendatahub-io-modelmesh-serving-release-0.11.yaml
@@ -5,8 +5,21 @@ base_images:
     tag: "8"
 build_root:
   project_image:
-    dockerfile_path: Dockerfile.develop
+    dockerfile_literal: "FROM registry.access.redhat.com/ubi8/go-toolset:1.19\nENV
+      GOBIN=/go/bin\nENV PATH=/usr/local/go/bin:${GOBIN}:$PATH\nUSER root\n# Prow
+      expects to be able to check out a repo under /go \nWORKDIR /go\nRUN umask 0111
+      && find /go -type d -not -perm -0775 | xargs --max-procs 10 --max-args 100 --no-run-if-empty
+      chmod g+xw"
 images:
+- build_args:
+  - name: TARGETOS
+    value: linux
+  - name: TARGETARCH
+    value: amd64
+  context_dir: .
+  dockerfile_path: Dockerfile.develop.ci
+  from: src
+  to: modelmesh-serving-develop
 - build_args:
   - name: COMMIT_SHA
     value: ci-sha
@@ -16,7 +29,7 @@ images:
   dockerfile_path: Dockerfile
   from: ubi_minimal
   inputs:
-    root:
+    modelmesh-serving-develop:
       as:
       - ${DEV_IMAGE}
   to: modelmesh-serving
@@ -44,14 +57,14 @@ tests:
     export HOME=/go
     make test
   container:
-    from: src
+    from: modelmesh-serving-develop
   run_if_changed: ^(apis/.*|controllers/.*|pkg/.*|main\.go|Dockerfile|go\.mod|go\.sum)
 - as: fvt
   run_if_changed: ^(apis/.*|controllers/.*|fvt/.*|pkg/.*|scripts/.*|proto/.*|config/.*|Makefile|main\.go|Dockerfile|go\.mod|go\.sum)
   steps:
-    cluster_profile: gcp
+    cluster_profile: aws
     env:
-      COMPUTE_NODE_TYPE: n2-standard-8
+      COMPUTE_NODE_TYPE: m5.2xlarge
     test:
     - as: fvt
       commands: |
@@ -63,12 +76,12 @@ tests:
       dependencies:
       - env: PR_MODELMESH_SERVING_IMAGE
         name: modelmesh-serving
-      from: src
+      from: modelmesh-serving-develop
       resources:
         requests:
           cpu: 2000m
           memory: 3Gi
-    workflow: ipi-gcp
+    workflow: ipi-aws
 - as: fvt-odh-manifests
   run_if_changed: ^(opendatahub/odh-manifests)
   steps:
@@ -83,7 +96,7 @@ tests:
       dependencies:
       - env: PR_MODELMESH_SERVING_IMAGE
         name: modelmesh-serving
-      from: src
+      from: modelmesh-serving-develop
       resources:
         requests:
           cpu: 2000m

diff --git a/...atahub-io/modelmesh-serving/opendatahub-io-modelmesh-serving-release-0.11-presubmits.yaml b/...atahub-io/modelmesh-serving/opendatahub-io-modelmesh-serving-release-0.11-presubmits.yaml
@@ -5,14 +5,14 @@ presubmits:
     branches:
     - ^release-0\.11$
     - ^release-0\.11-
-    cluster: build04
+    cluster: build05
     context: ci/prow/fvt
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-opendatahub-io-modelmesh-serving-release-0.11-fvt
@@ -66,12 +66,8 @@ presubmits:
         secret:
           secretName: ci-pull-credentials
       - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
+        secret:
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials