From f0f07e0d9dc55de8fe0ae2c7f2e86cc69c614d82 Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Mon, 4 Dec 2023 15:25:49 +0100 Subject: [PATCH 01/11] PULL_BASE_REF --- .../kyma-project/eventing-manager/eventing-manager-generic.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml index 315df6814183..24263e8071f3 100644 --- a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml +++ b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml @@ -128,6 +128,7 @@ postsubmits: # runs on main - "--config=/config/kaniko-build-config.yaml" - "--context=." - "--dockerfile=Dockerfile" + - "--tag={{.Env \"PULL_BASE_REF\" }}" - "--tag={{ .Env \"PULL_BASE_SHA\" }}" resources: requests: From a9cedc0d231be34c0a9f846deb8b1d300bb5ae53 Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 10:55:22 +0100 Subject: [PATCH 02/11] release-eventing-manager-build --- .../eventing-manager/eventing-manager-generic.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml index 24263e8071f3..3d356ed2a4a1 100644 --- a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml +++ b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml @@ -112,7 +112,7 @@ postsubmits: # runs on main cluster: trusted-workload max_concurrency: 10 branches: - - ^\d+\.\d+\.\d+(?:-.*)?$ + - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag spec: containers: - image: "eu.gcr.io/sap-kyma-neighbors-dev/image-builder:v20230313-8dfce5f0b" @@ -129,7 +129,6 @@ postsubmits: # runs on main - "--context=." - "--dockerfile=Dockerfile" - "--tag={{.Env \"PULL_BASE_REF\" }}" - - "--tag={{ .Env \"PULL_BASE_SHA\" }}" resources: requests: memory: 1.5Gi From 047abe0304ae014fc45c90290d0d9e25ac89f640 Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 11:29:37 +0100 Subject: [PATCH 03/11] Skip latest tag for 0.0.0 --- .../eventing-manager/eventing-manager-generic.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml index 3d356ed2a4a1..34d1d9dca390 100644 --- a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml +++ b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml @@ -1,6 +1,5 @@ # Code generated by rendertemplates. DO NOT EDIT. - presubmits: # runs on PRs kyma-project/eventing-manager: - name: pull-eventing-manager-build @@ -93,7 +92,7 @@ presubmits: # runs on PRs requests: memory: 3Gi cpu: 2 - + postsubmits: # runs on main kyma-project/eventing-manager: - name: release-eventing-manager-build @@ -128,7 +127,7 @@ postsubmits: # runs on main - "--config=/config/kaniko-build-config.yaml" - "--context=." - "--dockerfile=Dockerfile" - - "--tag={{.Env \"PULL_BASE_REF\" }}" + - '--tag={{.Env "PULL_BASE_REF" }}' resources: requests: memory: 1.5Gi @@ -167,6 +166,8 @@ postsubmits: # runs on main max_concurrency: 10 branches: - ^\d+\.\d+\.\d+(?:-.*)?$ + skip_branches: + - 0.0.0 # Skip latest tag for 0.0.0 spec: containers: - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20231130-5e582eeb" @@ -285,4 +286,3 @@ postsubmits: # runs on main requests: memory: 3Gi cpu: 2 - \ No newline at end of file From 4d7880e8fc91b876bbcc9d276fa12c17f3151273 Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 11:48:10 +0100 Subject: [PATCH 04/11] PULL_BASE_REF --- .../eventing-manager/eventing-manager-generic.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml index 34d1d9dca390..1e0195dbd967 100644 --- a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml +++ b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml @@ -127,7 +127,7 @@ postsubmits: # runs on main - "--config=/config/kaniko-build-config.yaml" - "--context=." - "--dockerfile=Dockerfile" - - '--tag={{.Env "PULL_BASE_REF" }}' + - "--tag=$(PULL_BASE_REF)" resources: requests: memory: 1.5Gi @@ -182,7 +182,7 @@ postsubmits: # runs on main - "ci" env: - name: IMG - value: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${PULL_BASE_SHA}" + value: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${PULL_BASE_REF}" - name: KUSTOMIZE_VERSION value: "v4.5.6" - name: MODULE_REGISTRY From 34ad41d92db85a964477b80118ae9fe49161aa8f Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 11:49:08 +0100 Subject: [PATCH 05/11] PULL_BASE_REF formatting --- .../kyma-project/eventing-manager/eventing-manager-generic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml index 1e0195dbd967..507c55de382b 100644 --- a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml +++ b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml @@ -127,7 +127,7 @@ postsubmits: # runs on main - "--config=/config/kaniko-build-config.yaml" - "--context=." - "--dockerfile=Dockerfile" - - "--tag=$(PULL_BASE_REF)" + - "--tag={{ .Env \"PULL_BASE_REF\" }}" resources: requests: memory: 1.5Gi From 611ed49374433f32b877143fa98885b4a771b745 Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 13:47:39 +0100 Subject: [PATCH 06/11] Comments and skip for latest Tag --- .../eventing-manager/eventing-manager-generic.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml index 507c55de382b..3c493da9eb44 100644 --- a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml +++ b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml @@ -111,7 +111,7 @@ postsubmits: # runs on main cluster: trusted-workload max_concurrency: 10 branches: - - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag + - ^\d+\.\d+\.\d+(?:-.*)?$ # Watches for new Tag spec: containers: - image: "eu.gcr.io/sap-kyma-neighbors-dev/image-builder:v20230313-8dfce5f0b" @@ -165,9 +165,9 @@ postsubmits: # runs on main cluster: trusted-workload max_concurrency: 10 branches: - - ^\d+\.\d+\.\d+(?:-.*)?$ + - ^\d+\.\d+\.\d+(?:-.*)?$ # Watches for new Tag skip_branches: - - 0.0.0 # Skip latest tag for 0.0.0 + - 0.0.0 # Skip for 0.0.0 Tag spec: containers: - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20231130-5e582eeb" @@ -209,6 +209,8 @@ postsubmits: # runs on main decorate: true cluster: trusted-workload max_concurrency: 10 + skip_branches: + - 0.0.0 # Skip for 0.0.0 Tag spec: containers: - image: "eu.gcr.io/sap-kyma-neighbors-dev/image-builder:v20230313-8dfce5f0b" From c93fdbc996e0282732cb2af448b01ebc8312849f Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 14:55:23 +0100 Subject: [PATCH 07/11] Delete template --- templates/data/eventing-manager-data.yaml | 191 ---------------------- 1 file changed, 191 deletions(-) delete mode 100644 templates/data/eventing-manager-data.yaml diff --git a/templates/data/eventing-manager-data.yaml b/templates/data/eventing-manager-data.yaml deleted file mode 100644 index fb25a7472041..000000000000 --- a/templates/data/eventing-manager-data.yaml +++ /dev/null @@ -1,191 +0,0 @@ -templates: - - from: generic.tmpl - render: - - to: ../../prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml - localSets: - job_build: - skip_report: "false" - max_concurrency: "10" - decorate: "true" - branches: - - "^master$" - - "^main$" - pubsub_project: "sap-kyma-prow" - pubsub_topic: "prowjobs" - image: eu.gcr.io/sap-kyma-neighbors-dev/image-builder:v20230313-8dfce5f0b - command: /image-builder - request_memory: "1.5Gi" - request_cpu: "1" - labels: - preset-sa-kyma-push-images: "true" - volumes: - - name: config - configMapName: kaniko-build-config - - name: signify-secret - secretName: signify-dev-secret - volumeMounts: - - name: config - mountPath: /config - readOnly: true - - name: signify-secret - mountPath: /secret - readOnly: true - limits: - limits_memory: 3Gi - limits_cpu: 2 - dind_job_k3d: - annotations: - labels: - preset-kyma-guard-bot-github-token: "true" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20231130-5e582eeb - command: "/init.sh" - request_memory: "4Gi" - request_cpu: "3" - limits_memory: "4Gi" - limits_cpu: "3" - job_default: - securityContext: - privileged: false - seccompProfile: - type: RuntimeDefault - jobConfigs: - - repoName: "github.com/kyma-project/eventing-manager" - jobs: - - jobConfig: - name: release-eventing-manager-build - annotations: - owner: skydivingtunas - description: Job to build eventing module for a release. - always_run: true - labels: - preset-signify-prod-secret: "true" - args: - - "--name=eventing-manager" - - "--config=/config/kaniko-build-config.yaml" - - "--context=." - - "--dockerfile=Dockerfile" - - '--tag={{`{{ .Env \"PULL_BASE_SHA\" }}`}}' - branches: - - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_postsubmit - local: - - job_build - - limits - - jobConfig: - name: release-eventing-manager-module-build - annotations: - owner: skydivingtunas - description: Job to build eventing module for a release. - always_run: true - labels: - preset-sa-kyma-push-images: "true" - preset-bot-github-token: "true" - env: - KUSTOMIZE_VERSION: "v4.5.6" - MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" - IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${PULL_BASE_SHA}" - command: "./scripts/release.sh" - args: - - "ci" - branches: - - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag - inheritedConfigs: - global: - - image_buildpack-golang # takes latest golang image - - jobConfig_default - - jobConfig_postsubmit - local: - - limits - - jobConfig: - name: pull-eventing-manager-build - args: - - "--name=eventing-manager" - - "--config=/config/kaniko-build-config.yaml" - - "--context=." - - "--dockerfile=Dockerfile" - always_run: true - skip_if_only_changed: "^docs/|\\.(md|adoc)$|^(README|LICENSE)$" - annotations: - owner: skydivingtunas - description: build eventing manager image - inheritedConfigs: - global: - - kaniko_buildpack - - jobConfig_presubmit - - jobConfig: - name: post-eventing-manager-build - labels: - preset-signify-prod-secret: "true" - args: - - "--name=eventing-manager" - - "--config=/config/kaniko-build-config.yaml" - - "--context=." - - "--dockerfile=Dockerfile" - - "--tag=latest" - always_run: true - annotations: - owner: skydivingtunas - description: build eventing manager image - inheritedConfigs: - global: - - kaniko_buildpack - - jobConfig_postsubmit - - jobConfig: - name: pull-eventing-module-build - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231130-5e582eeb - annotations: - owner: skydivingtunas - description: Eventing module build pre-main job - labels: - preset-sa-kyma-push-images: "true" - env: - KUSTOMIZE_VERSION: "v4.5.7" - MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/dev/unsigned" - IMG: "europe-docker.pkg.dev/kyma-project/dev/eventing-manager:PR-${PULL_NUMBER}" - MODULE_SHA: "PR-${PULL_NUMBER}" - always_run: true - command: "make" - args: - - "-C" - - "hack/ci" - - "module-build" - branches: - - ^main$ # any pr against main triggers this - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_presubmit - local: - - job_default - - jobConfig: - name: post-eventing-module-build - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231130-5e582eeb - annotations: - owner: skydivingtunas - description: Eventing module build post-main job - labels: - preset-sa-kyma-push-images: "true" - env: - KUSTOMIZE_VERSION: "v4.5.7" - MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" - IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:$(shell date +v%Y%m%d)-$(shell echo ${PULL_BASE_SHA} | head -c 8)" # The tag script is evaluated in makefile. - MODULE_SHA: "$(shell echo ${PULL_BASE_SHA} | head -c 8)" # The script is evaluated in makefile. - always_run: true - command: "make" - args: - - "-C" - - "hack/ci" - - "module-build" - branches: - - ^main$ # any pr against main triggers this - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_postsubmit - local: - - job_default From 78534fab45903fb60547a8d4607b82e5c0c215fb Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 14:59:48 +0100 Subject: [PATCH 08/11] Restore file --- templates/data/eventing-manager-data.yaml | 191 ++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 templates/data/eventing-manager-data.yaml diff --git a/templates/data/eventing-manager-data.yaml b/templates/data/eventing-manager-data.yaml new file mode 100644 index 000000000000..fb25a7472041 --- /dev/null +++ b/templates/data/eventing-manager-data.yaml @@ -0,0 +1,191 @@ +templates: + - from: generic.tmpl + render: + - to: ../../prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml + localSets: + job_build: + skip_report: "false" + max_concurrency: "10" + decorate: "true" + branches: + - "^master$" + - "^main$" + pubsub_project: "sap-kyma-prow" + pubsub_topic: "prowjobs" + image: eu.gcr.io/sap-kyma-neighbors-dev/image-builder:v20230313-8dfce5f0b + command: /image-builder + request_memory: "1.5Gi" + request_cpu: "1" + labels: + preset-sa-kyma-push-images: "true" + volumes: + - name: config + configMapName: kaniko-build-config + - name: signify-secret + secretName: signify-dev-secret + volumeMounts: + - name: config + mountPath: /config + readOnly: true + - name: signify-secret + mountPath: /secret + readOnly: true + limits: + limits_memory: 3Gi + limits_cpu: 2 + dind_job_k3d: + annotations: + labels: + preset-kyma-guard-bot-github-token: "true" + preset-kind-volume-mounts: "true" + preset-dind-enabled: "true" + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20231130-5e582eeb + command: "/init.sh" + request_memory: "4Gi" + request_cpu: "3" + limits_memory: "4Gi" + limits_cpu: "3" + job_default: + securityContext: + privileged: false + seccompProfile: + type: RuntimeDefault + jobConfigs: + - repoName: "github.com/kyma-project/eventing-manager" + jobs: + - jobConfig: + name: release-eventing-manager-build + annotations: + owner: skydivingtunas + description: Job to build eventing module for a release. + always_run: true + labels: + preset-signify-prod-secret: "true" + args: + - "--name=eventing-manager" + - "--config=/config/kaniko-build-config.yaml" + - "--context=." + - "--dockerfile=Dockerfile" + - '--tag={{`{{ .Env \"PULL_BASE_SHA\" }}`}}' + branches: + - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag + inheritedConfigs: + global: + - jobConfig_default + - jobConfig_postsubmit + local: + - job_build + - limits + - jobConfig: + name: release-eventing-manager-module-build + annotations: + owner: skydivingtunas + description: Job to build eventing module for a release. + always_run: true + labels: + preset-sa-kyma-push-images: "true" + preset-bot-github-token: "true" + env: + KUSTOMIZE_VERSION: "v4.5.6" + MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" + IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${PULL_BASE_SHA}" + command: "./scripts/release.sh" + args: + - "ci" + branches: + - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag + inheritedConfigs: + global: + - image_buildpack-golang # takes latest golang image + - jobConfig_default + - jobConfig_postsubmit + local: + - limits + - jobConfig: + name: pull-eventing-manager-build + args: + - "--name=eventing-manager" + - "--config=/config/kaniko-build-config.yaml" + - "--context=." + - "--dockerfile=Dockerfile" + always_run: true + skip_if_only_changed: "^docs/|\\.(md|adoc)$|^(README|LICENSE)$" + annotations: + owner: skydivingtunas + description: build eventing manager image + inheritedConfigs: + global: + - kaniko_buildpack + - jobConfig_presubmit + - jobConfig: + name: post-eventing-manager-build + labels: + preset-signify-prod-secret: "true" + args: + - "--name=eventing-manager" + - "--config=/config/kaniko-build-config.yaml" + - "--context=." + - "--dockerfile=Dockerfile" + - "--tag=latest" + always_run: true + annotations: + owner: skydivingtunas + description: build eventing manager image + inheritedConfigs: + global: + - kaniko_buildpack + - jobConfig_postsubmit + - jobConfig: + name: pull-eventing-module-build + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231130-5e582eeb + annotations: + owner: skydivingtunas + description: Eventing module build pre-main job + labels: + preset-sa-kyma-push-images: "true" + env: + KUSTOMIZE_VERSION: "v4.5.7" + MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/dev/unsigned" + IMG: "europe-docker.pkg.dev/kyma-project/dev/eventing-manager:PR-${PULL_NUMBER}" + MODULE_SHA: "PR-${PULL_NUMBER}" + always_run: true + command: "make" + args: + - "-C" + - "hack/ci" + - "module-build" + branches: + - ^main$ # any pr against main triggers this + inheritedConfigs: + global: + - jobConfig_default + - jobConfig_presubmit + local: + - job_default + - jobConfig: + name: post-eventing-module-build + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231130-5e582eeb + annotations: + owner: skydivingtunas + description: Eventing module build post-main job + labels: + preset-sa-kyma-push-images: "true" + env: + KUSTOMIZE_VERSION: "v4.5.7" + MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" + IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:$(shell date +v%Y%m%d)-$(shell echo ${PULL_BASE_SHA} | head -c 8)" # The tag script is evaluated in makefile. + MODULE_SHA: "$(shell echo ${PULL_BASE_SHA} | head -c 8)" # The script is evaluated in makefile. + always_run: true + command: "make" + args: + - "-C" + - "hack/ci" + - "module-build" + branches: + - ^main$ # any pr against main triggers this + inheritedConfigs: + global: + - jobConfig_default + - jobConfig_postsubmit + local: + - job_default From 9b10226d8bdeeb868b2ac148cc68f5b44a8c1bdf Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 15:26:57 +0100 Subject: [PATCH 09/11] Template --- templates/data/eventing-manager-data.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/data/eventing-manager-data.yaml b/templates/data/eventing-manager-data.yaml index fb25a7472041..a4a81ad95ae4 100644 --- a/templates/data/eventing-manager-data.yaml +++ b/templates/data/eventing-manager-data.yaml @@ -39,7 +39,7 @@ templates: preset-kyma-guard-bot-github-token: "true" preset-kind-volume-mounts: "true" preset-dind-enabled: "true" - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20231130-5e582eeb + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20231204-57f98c4e command: "/init.sh" request_memory: "4Gi" request_cpu: "3" @@ -137,7 +137,7 @@ templates: - jobConfig_postsubmit - jobConfig: name: pull-eventing-module-build - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231130-5e582eeb + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231204-57f98c4e annotations: owner: skydivingtunas description: Eventing module build pre-main job @@ -164,7 +164,7 @@ templates: - job_default - jobConfig: name: post-eventing-module-build - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231130-5e582eeb + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231204-57f98c4e annotations: owner: skydivingtunas description: Eventing module build post-main job @@ -188,4 +188,4 @@ templates: - jobConfig_default - jobConfig_postsubmit local: - - job_default + - job_default \ No newline at end of file From cc0ffd7f1bb75e3235d3bcb87d0a521701e61b12 Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 15:36:55 +0100 Subject: [PATCH 10/11] Delete template --- templates/data/eventing-manager-data.yaml | 191 ---------------------- 1 file changed, 191 deletions(-) delete mode 100644 templates/data/eventing-manager-data.yaml diff --git a/templates/data/eventing-manager-data.yaml b/templates/data/eventing-manager-data.yaml deleted file mode 100644 index a4a81ad95ae4..000000000000 --- a/templates/data/eventing-manager-data.yaml +++ /dev/null @@ -1,191 +0,0 @@ -templates: - - from: generic.tmpl - render: - - to: ../../prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml - localSets: - job_build: - skip_report: "false" - max_concurrency: "10" - decorate: "true" - branches: - - "^master$" - - "^main$" - pubsub_project: "sap-kyma-prow" - pubsub_topic: "prowjobs" - image: eu.gcr.io/sap-kyma-neighbors-dev/image-builder:v20230313-8dfce5f0b - command: /image-builder - request_memory: "1.5Gi" - request_cpu: "1" - labels: - preset-sa-kyma-push-images: "true" - volumes: - - name: config - configMapName: kaniko-build-config - - name: signify-secret - secretName: signify-dev-secret - volumeMounts: - - name: config - mountPath: /config - readOnly: true - - name: signify-secret - mountPath: /secret - readOnly: true - limits: - limits_memory: 3Gi - limits_cpu: 2 - dind_job_k3d: - annotations: - labels: - preset-kyma-guard-bot-github-token: "true" - preset-kind-volume-mounts: "true" - preset-dind-enabled: "true" - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20231204-57f98c4e - command: "/init.sh" - request_memory: "4Gi" - request_cpu: "3" - limits_memory: "4Gi" - limits_cpu: "3" - job_default: - securityContext: - privileged: false - seccompProfile: - type: RuntimeDefault - jobConfigs: - - repoName: "github.com/kyma-project/eventing-manager" - jobs: - - jobConfig: - name: release-eventing-manager-build - annotations: - owner: skydivingtunas - description: Job to build eventing module for a release. - always_run: true - labels: - preset-signify-prod-secret: "true" - args: - - "--name=eventing-manager" - - "--config=/config/kaniko-build-config.yaml" - - "--context=." - - "--dockerfile=Dockerfile" - - '--tag={{`{{ .Env \"PULL_BASE_SHA\" }}`}}' - branches: - - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_postsubmit - local: - - job_build - - limits - - jobConfig: - name: release-eventing-manager-module-build - annotations: - owner: skydivingtunas - description: Job to build eventing module for a release. - always_run: true - labels: - preset-sa-kyma-push-images: "true" - preset-bot-github-token: "true" - env: - KUSTOMIZE_VERSION: "v4.5.6" - MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" - IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${PULL_BASE_SHA}" - command: "./scripts/release.sh" - args: - - "ci" - branches: - - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag - inheritedConfigs: - global: - - image_buildpack-golang # takes latest golang image - - jobConfig_default - - jobConfig_postsubmit - local: - - limits - - jobConfig: - name: pull-eventing-manager-build - args: - - "--name=eventing-manager" - - "--config=/config/kaniko-build-config.yaml" - - "--context=." - - "--dockerfile=Dockerfile" - always_run: true - skip_if_only_changed: "^docs/|\\.(md|adoc)$|^(README|LICENSE)$" - annotations: - owner: skydivingtunas - description: build eventing manager image - inheritedConfigs: - global: - - kaniko_buildpack - - jobConfig_presubmit - - jobConfig: - name: post-eventing-manager-build - labels: - preset-signify-prod-secret: "true" - args: - - "--name=eventing-manager" - - "--config=/config/kaniko-build-config.yaml" - - "--context=." - - "--dockerfile=Dockerfile" - - "--tag=latest" - always_run: true - annotations: - owner: skydivingtunas - description: build eventing manager image - inheritedConfigs: - global: - - kaniko_buildpack - - jobConfig_postsubmit - - jobConfig: - name: pull-eventing-module-build - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231204-57f98c4e - annotations: - owner: skydivingtunas - description: Eventing module build pre-main job - labels: - preset-sa-kyma-push-images: "true" - env: - KUSTOMIZE_VERSION: "v4.5.7" - MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/dev/unsigned" - IMG: "europe-docker.pkg.dev/kyma-project/dev/eventing-manager:PR-${PULL_NUMBER}" - MODULE_SHA: "PR-${PULL_NUMBER}" - always_run: true - command: "make" - args: - - "-C" - - "hack/ci" - - "module-build" - branches: - - ^main$ # any pr against main triggers this - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_presubmit - local: - - job_default - - jobConfig: - name: post-eventing-module-build - image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231204-57f98c4e - annotations: - owner: skydivingtunas - description: Eventing module build post-main job - labels: - preset-sa-kyma-push-images: "true" - env: - KUSTOMIZE_VERSION: "v4.5.7" - MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" - IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:$(shell date +v%Y%m%d)-$(shell echo ${PULL_BASE_SHA} | head -c 8)" # The tag script is evaluated in makefile. - MODULE_SHA: "$(shell echo ${PULL_BASE_SHA} | head -c 8)" # The script is evaluated in makefile. - always_run: true - command: "make" - args: - - "-C" - - "hack/ci" - - "module-build" - branches: - - ^main$ # any pr against main triggers this - inheritedConfigs: - global: - - jobConfig_default - - jobConfig_postsubmit - local: - - job_default \ No newline at end of file From 0821bfce23add34397d846fa00629a50acdd0e43 Mon Sep 17 00:00:00 2001 From: "Kiss, Tibor" Date: Wed, 6 Dec 2023 15:40:32 +0100 Subject: [PATCH 11/11] Restore template --- templates/data/eventing-manager-data.yaml | 191 ++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 templates/data/eventing-manager-data.yaml diff --git a/templates/data/eventing-manager-data.yaml b/templates/data/eventing-manager-data.yaml new file mode 100644 index 000000000000..fb25a7472041 --- /dev/null +++ b/templates/data/eventing-manager-data.yaml @@ -0,0 +1,191 @@ +templates: + - from: generic.tmpl + render: + - to: ../../prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml + localSets: + job_build: + skip_report: "false" + max_concurrency: "10" + decorate: "true" + branches: + - "^master$" + - "^main$" + pubsub_project: "sap-kyma-prow" + pubsub_topic: "prowjobs" + image: eu.gcr.io/sap-kyma-neighbors-dev/image-builder:v20230313-8dfce5f0b + command: /image-builder + request_memory: "1.5Gi" + request_cpu: "1" + labels: + preset-sa-kyma-push-images: "true" + volumes: + - name: config + configMapName: kaniko-build-config + - name: signify-secret + secretName: signify-dev-secret + volumeMounts: + - name: config + mountPath: /config + readOnly: true + - name: signify-secret + mountPath: /secret + readOnly: true + limits: + limits_memory: 3Gi + limits_cpu: 2 + dind_job_k3d: + annotations: + labels: + preset-kyma-guard-bot-github-token: "true" + preset-kind-volume-mounts: "true" + preset-dind-enabled: "true" + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-dind-k3d:v20231130-5e582eeb + command: "/init.sh" + request_memory: "4Gi" + request_cpu: "3" + limits_memory: "4Gi" + limits_cpu: "3" + job_default: + securityContext: + privileged: false + seccompProfile: + type: RuntimeDefault + jobConfigs: + - repoName: "github.com/kyma-project/eventing-manager" + jobs: + - jobConfig: + name: release-eventing-manager-build + annotations: + owner: skydivingtunas + description: Job to build eventing module for a release. + always_run: true + labels: + preset-signify-prod-secret: "true" + args: + - "--name=eventing-manager" + - "--config=/config/kaniko-build-config.yaml" + - "--context=." + - "--dockerfile=Dockerfile" + - '--tag={{`{{ .Env \"PULL_BASE_SHA\" }}`}}' + branches: + - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag + inheritedConfigs: + global: + - jobConfig_default + - jobConfig_postsubmit + local: + - job_build + - limits + - jobConfig: + name: release-eventing-manager-module-build + annotations: + owner: skydivingtunas + description: Job to build eventing module for a release. + always_run: true + labels: + preset-sa-kyma-push-images: "true" + preset-bot-github-token: "true" + env: + KUSTOMIZE_VERSION: "v4.5.6" + MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" + IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${PULL_BASE_SHA}" + command: "./scripts/release.sh" + args: + - "ci" + branches: + - ^\d+\.\d+\.\d+(?:-.*)?$ #Watches for new Tag + inheritedConfigs: + global: + - image_buildpack-golang # takes latest golang image + - jobConfig_default + - jobConfig_postsubmit + local: + - limits + - jobConfig: + name: pull-eventing-manager-build + args: + - "--name=eventing-manager" + - "--config=/config/kaniko-build-config.yaml" + - "--context=." + - "--dockerfile=Dockerfile" + always_run: true + skip_if_only_changed: "^docs/|\\.(md|adoc)$|^(README|LICENSE)$" + annotations: + owner: skydivingtunas + description: build eventing manager image + inheritedConfigs: + global: + - kaniko_buildpack + - jobConfig_presubmit + - jobConfig: + name: post-eventing-manager-build + labels: + preset-signify-prod-secret: "true" + args: + - "--name=eventing-manager" + - "--config=/config/kaniko-build-config.yaml" + - "--context=." + - "--dockerfile=Dockerfile" + - "--tag=latest" + always_run: true + annotations: + owner: skydivingtunas + description: build eventing manager image + inheritedConfigs: + global: + - kaniko_buildpack + - jobConfig_postsubmit + - jobConfig: + name: pull-eventing-module-build + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231130-5e582eeb + annotations: + owner: skydivingtunas + description: Eventing module build pre-main job + labels: + preset-sa-kyma-push-images: "true" + env: + KUSTOMIZE_VERSION: "v4.5.7" + MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/dev/unsigned" + IMG: "europe-docker.pkg.dev/kyma-project/dev/eventing-manager:PR-${PULL_NUMBER}" + MODULE_SHA: "PR-${PULL_NUMBER}" + always_run: true + command: "make" + args: + - "-C" + - "hack/ci" + - "module-build" + branches: + - ^main$ # any pr against main triggers this + inheritedConfigs: + global: + - jobConfig_default + - jobConfig_presubmit + local: + - job_default + - jobConfig: + name: post-eventing-module-build + image: europe-docker.pkg.dev/kyma-project/prod/testimages/e2e-gcloud:v20231130-5e582eeb + annotations: + owner: skydivingtunas + description: Eventing module build post-main job + labels: + preset-sa-kyma-push-images: "true" + env: + KUSTOMIZE_VERSION: "v4.5.7" + MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" + IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:$(shell date +v%Y%m%d)-$(shell echo ${PULL_BASE_SHA} | head -c 8)" # The tag script is evaluated in makefile. + MODULE_SHA: "$(shell echo ${PULL_BASE_SHA} | head -c 8)" # The script is evaluated in makefile. + always_run: true + command: "make" + args: + - "-C" + - "hack/ci" + - "module-build" + branches: + - ^main$ # any pr against main triggers this + inheritedConfigs: + global: + - jobConfig_default + - jobConfig_postsubmit + local: + - job_default