Switch operators builds to use specific dockerfiles (kyma-project#9577)

* switch operators builds to use specific dockerfiles * add pjtester.yaml * dev pjtester
dekiel · Jan 12, 2024 · 06cdd53 · 06cdd53
1 parent 123f80a
commit 06cdd53
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/prow/jobs/kyma-project/serverless/serverless-build-operator.yaml b/prow/jobs/kyma-project/serverless/serverless-build-operator.yaml
@@ -76,7 +76,7 @@ presubmits: # runs on PRs
               - "sh"
             args:
               - "-c"
-              - "/image-builder --name=serverless-operator --config=/config/kaniko-build-config.yaml --context=. --dockerfile=components/operator/Dockerfile"
+              - "/image-builder --name=serverless-operator --config=/config/kaniko-build-config.yaml --context=. --dockerfile=components/operator/Dockerfile.dev --build-arg=IMG_DIRECTORY=dev --build-arg=IMG_VERSION=PR-$PULL_NUMBER"
             env:
               - name: BUILDKITD_FLAGS
                 value: "--oci-worker-no-process-sandbox"
@@ -176,7 +176,7 @@ postsubmits: # runs on main
               - "sh"
             args:
               - "-c"
-              - "/image-builder --name=serverless-operator --config=/config/kaniko-build-config.yaml --context=. --dockerfile=components/operator/Dockerfile --tag=$PULL_BASE_SHA --tag=$PULL_BASE_REF"
+              - "/image-builder --name=serverless-operator --config=/config/kaniko-build-config.yaml --context=. --dockerfile=components/operator/Dockerfile.dev --build-arg=IMG_DIRECTORY=prod --build-arg=IMG_VERSION=$PULL_BASE_SHA --tag=$PULL_BASE_SHA --tag=$PULL_BASE_REF"
             env:
               - name: BUILDKITD_FLAGS
                 value: "--oci-worker-no-process-sandbox"

diff --git a/prow/jobs/kyma-project/serverless/serverless-release.yaml b/prow/jobs/kyma-project/serverless/serverless-release.yaml
@@ -32,7 +32,7 @@ postsubmits: # runs on main
               - "sh"
             args:
               - "-c"
-              - "/image-builder --name=serverless-operator --config=/config/kaniko-build-config.yaml --context=. --dockerfile=components/operator/Dockerfile --tag=$PULL_BASE_REF"
+              - "/image-builder --name=serverless-operator --config=/config/kaniko-build-config.yaml --context=. --dockerfile=components/operator/Dockerfile.release --tag=$PULL_BASE_REF"
             env:
               - name: BUILDKITD_FLAGS
                 value: "--oci-worker-no-process-sandbox"

diff --git a/templates/data/serverless.yaml b/templates/data/serverless.yaml
@@ -378,7 +378,9 @@ templates:
                       --name=serverless-operator
                       --config=/config/kaniko-build-config.yaml
                       --context=.
-                      --dockerfile=components/operator/Dockerfile
+                      --dockerfile=components/operator/Dockerfile.dev
+                      --build-arg=IMG_DIRECTORY=dev
+                      --build-arg=IMG_VERSION=PR-$PULL_NUMBER
                 inheritedConfigs:
                   global:
                     - jobConfig_presubmit
@@ -401,7 +403,9 @@ templates:
                       --name=serverless-operator
                       --config=/config/kaniko-build-config.yaml
                       --context=.
-                      --dockerfile=components/operator/Dockerfile
+                      --dockerfile=components/operator/Dockerfile.dev
+                      --build-arg=IMG_DIRECTORY=prod
+                      --build-arg=IMG_VERSION=$PULL_BASE_SHA
                       --tag=$PULL_BASE_SHA
                       --tag=$PULL_BASE_REF
                 inheritedConfigs:
@@ -435,7 +439,7 @@ templates:
                       --name=serverless-operator
                       --config=/config/kaniko-build-config.yaml
                       --context=.
-                      --dockerfile=components/operator/Dockerfile
+                      --dockerfile=components/operator/Dockerfile.release
                       --tag=$PULL_BASE_REF
                 inheritedConfigs:
                   global: