Dynamic Sources for serverless (kyma-project#9425)

* Merge to main * add_missing_changes * env * remove_pjtester * add_target
lindnerby · Dec 20, 2023 · 7ceef58 · 7ceef58
1 parent 2fb0e67
commit 7ceef58
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/prow/jobs/kyma-project/kyma/tests/serverless/serverless-integration-k3d.yaml b/prow/jobs/kyma-project/kyma/tests/serverless/serverless-integration-k3d.yaml
@@ -38,6 +38,10 @@ presubmits: # runs on PRs
               - "-c"
               - "/home/prow/go/src/github.com/kyma-project/test-infra/prow/scripts/cluster-integration/kyma-serverless-integration-k3d.sh serverless-integration serverless-contract-tests"
             env:
+              - name: IMG_DIRECTORY
+                value: "dev"
+              - name: IMG_VERSION
+                value: "PR-$PULL_NUMBER"
               - name: SERVERLESS_SOURCES
                 value: "/home/prow/go/src/github.com/kyma-project/serverless/"
     - name: pre-serverless-git-auth-integration-k3s
@@ -78,6 +82,10 @@ presubmits: # runs on PRs
               - "-c"
               - "/home/prow/go/src/github.com/kyma-project/test-infra/prow/scripts/cluster-integration/kyma-serverless-integration-k3d.sh git-auth-integration"
             env:
+              - name: IMG_DIRECTORY
+                value: "dev"
+              - name: IMG_VERSION
+                value: "PR-$PULL_NUMBER"
               - name: SERVERLESS_SOURCES
                 value: "/home/prow/go/src/github.com/kyma-project/serverless/"
               - name: APP_TEST_GITHUB_SSH_AUTH_KEY

diff --git a/prow/jobs/kyma-project/serverless/serverless-verify.yaml b/prow/jobs/kyma-project/serverless/serverless-verify.yaml
@@ -109,6 +109,11 @@ presubmits: # runs on PRs
               - "bash"
               - "-c"
               - "make -C components/operator/hack/ci k3d-integration-test"
+            env:
+              - name: IMG_DIRECTORY
+                value: "dev"
+              - name: IMG_VERSION
+                value: "PR-${PULL_NUMBER}"
             resources:
               requests:
                 memory: 4Gi
@@ -157,6 +162,11 @@ postsubmits: # runs on main
               - "bash"
               - "-c"
               - "make -C components/operator/hack/ci k3d-integration-test"
+            env:
+              - name: IMG_DIRECTORY
+                value: "prod"
+              - name: IMG_VERSION
+                value: "$PULL_BASE_SHA"
             resources:
               requests:
                 memory: 4Gi
@@ -202,6 +212,11 @@ postsubmits: # runs on main
               - "bash"
               - "-c"
               - "make -C components/operator/hack/ci k3d-upgrade-test"
+            env:
+              - name: IMG_DIRECTORY
+                value: "prod"
+              - name: IMG_VERSION
+                value: "$PULL_BASE_SHA"
             resources:
               requests:
                 memory: 4Gi

diff --git a/prow/scripts/cluster-integration/kyma-serverless-integration-k3d.sh b/prow/scripts/cluster-integration/kyma-serverless-integration-k3d.sh
@@ -9,7 +9,7 @@ source "${SCRIPT_DIR}/kyma-serverless-run-test.sh"
 
 date
 
-make -C "$SERVERLESS_SOURCES"/components/operator/hack/ci run-without-lifecycle-manager
+make -C "$SERVERLESS_SOURCES"/components/operator/hack/ci replace-chart-images run-without-lifecycle-manager
 
 export INTEGRATION_SUITE=("$@")
 run_tests "${INTEGRATION_SUITE[@]}"
diff --git a/templates/data/serverless.yaml b/templates/data/serverless.yaml
@@ -705,6 +705,9 @@ templates:
                   annotations:
                     owner: otters
                     description: serverless manager verify on k3d vm
+                  env:
+                    IMG_DIRECTORY: "dev"
+                    IMG_VERSION: "PR-${PULL_NUMBER}"
                   args:
                     - bash
                     - -c
@@ -725,6 +728,9 @@ templates:
                   annotations:
                     owner: otters
                     description: serverless manager verify on k3d vm
+                  env:
+                    IMG_DIRECTORY: "prod"
+                    IMG_VERSION: "$PULL_BASE_SHA"
                   args:
                     - bash
                     - -c
@@ -746,6 +752,9 @@ templates:
                     owner: otters
                     description: upgrade serverless operator test
                   optional: "true"
+                  env:
+                    IMG_DIRECTORY: "prod"
+                    IMG_VERSION: "$PULL_BASE_SHA"
                   args:
                     - bash
                     - -c