diff --git a/charts/custom-pipelines/templates/pipelines/gerrit-build-admin-console-edp.yaml b/charts/custom-pipelines/templates/pipelines/gerrit-build-admin-console-edp.yaml index d21da65a..c7cec91a 100644 --- a/charts/custom-pipelines/templates/pipelines/gerrit-build-admin-console-edp.yaml +++ b/charts/custom-pipelines/templates/pipelines/gerrit-build-admin-console-edp.yaml @@ -137,16 +137,6 @@ spec: - name: source workspace: shared-workspace - - name: create-ecr-repository - taskRef: - kind: Task - name: create-ecr-repository - runAfter: - - build - params: - - name: REPO_NAME - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)" - - name: kaniko-build taskRef: kind: Task @@ -156,10 +146,14 @@ spec: - get-version - build params: - - name: IMAGE - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)" - - name: KANIKO_CACHE_REPO - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" + - name: kaniko-cache-path + value: "kaniko-cache" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/templates/pipelines/gerrit-build-container-edp.yaml b/charts/custom-pipelines/templates/pipelines/gerrit-build-container-edp.yaml index 80bfe88d..e4157b1d 100644 --- a/charts/custom-pipelines/templates/pipelines/gerrit-build-container-edp.yaml +++ b/charts/custom-pipelines/templates/pipelines/gerrit-build-container-edp.yaml @@ -69,15 +69,6 @@ spec: - name: source workspace: shared-workspace - - name: create-ecr-repository - taskRef: - name: create-ecr-repository - runAfter: - - dockerfile-lint - params: - - name: REPO_NAME - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)" - - name: kaniko-build taskRef: name: kaniko @@ -85,10 +76,14 @@ spec: - create-ecr-repository - get-version params: - - name: IMAGE - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)" - - name: KANIKO_CACHE_REPO - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" + - name: kaniko-cache-path + value: "kaniko-cache" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/templates/pipelines/gerrit-build-edp-tekton-edp.yaml b/charts/custom-pipelines/templates/pipelines/gerrit-build-edp-tekton-edp.yaml index f7f87cc0..860ddc32 100644 --- a/charts/custom-pipelines/templates/pipelines/gerrit-build-edp-tekton-edp.yaml +++ b/charts/custom-pipelines/templates/pipelines/gerrit-build-edp-tekton-edp.yaml @@ -137,16 +137,6 @@ spec: - name: source workspace: shared-workspace - - name: create-ecr-repository - taskRef: - kind: Task - name: create-ecr-repository - runAfter: - - build - params: - - name: REPO_NAME - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)" - - name: kaniko-build taskRef: kind: Task @@ -156,10 +146,14 @@ spec: - get-version - build params: - - name: IMAGE - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)" - - name: KANIKO_CACHE_REPO - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" + - name: kaniko-cache-path + value: "kaniko-cache" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/templates/pipelines/gerrit-build-headlamp-edp.yaml b/charts/custom-pipelines/templates/pipelines/gerrit-build-headlamp-edp.yaml index 115f347a..bf2ab9fa 100644 --- a/charts/custom-pipelines/templates/pipelines/gerrit-build-headlamp-edp.yaml +++ b/charts/custom-pipelines/templates/pipelines/gerrit-build-headlamp-edp.yaml @@ -151,16 +151,6 @@ spec: - name: source workspace: shared-workspace - - name: create-ecr-repository - taskRef: - kind: Task - name: create-ecr-repository - runAfter: - - sonar - params: - - name: REPO_NAME - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)" - - name: kaniko-build taskRef: kind: Task @@ -168,10 +158,14 @@ spec: runAfter: - create-ecr-repository params: - - name: IMAGE - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)" - - name: KANIKO_CACHE_REPO - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" + - name: kaniko-cache-path + value: "kaniko-cache" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/templates/pipelines/gerrit-build-keycloak-operator-edp.yaml b/charts/custom-pipelines/templates/pipelines/gerrit-build-keycloak-operator-edp.yaml index b4345c6f..074c4db5 100644 --- a/charts/custom-pipelines/templates/pipelines/gerrit-build-keycloak-operator-edp.yaml +++ b/charts/custom-pipelines/templates/pipelines/gerrit-build-keycloak-operator-edp.yaml @@ -137,16 +137,6 @@ spec: - name: source workspace: shared-workspace - - name: create-ecr-repository - taskRef: - kind: Task - name: create-ecr-repository - runAfter: - - build - params: - - name: REPO_NAME - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)" - - name: kaniko-build taskRef: kind: Task @@ -154,8 +144,14 @@ spec: runAfter: - create-ecr-repository params: - - name: IMAGE - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" + - name: kaniko-cache-path + value: "kaniko-cache" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/templates/pipelines/gerrit-build-operator-edp.yaml b/charts/custom-pipelines/templates/pipelines/gerrit-build-operator-edp.yaml index 425d919e..f9130f18 100644 --- a/charts/custom-pipelines/templates/pipelines/gerrit-build-operator-edp.yaml +++ b/charts/custom-pipelines/templates/pipelines/gerrit-build-operator-edp.yaml @@ -137,16 +137,6 @@ spec: - name: source workspace: shared-workspace - - name: create-ecr-repository - taskRef: - kind: Task - name: create-ecr-repository - runAfter: - - build - params: - - name: REPO_NAME - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)" - - name: kaniko-build taskRef: kind: Task @@ -154,8 +144,14 @@ spec: runAfter: - create-ecr-repository params: - - name: IMAGE - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" + - name: kaniko-cache-path + value: "kaniko-cache" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/templates/pipelines/gerrit-build-sonar-operator-edp.yaml b/charts/custom-pipelines/templates/pipelines/gerrit-build-sonar-operator-edp.yaml index 536d306e..b21554b5 100644 --- a/charts/custom-pipelines/templates/pipelines/gerrit-build-sonar-operator-edp.yaml +++ b/charts/custom-pipelines/templates/pipelines/gerrit-build-sonar-operator-edp.yaml @@ -137,16 +137,6 @@ spec: - name: source workspace: shared-workspace - - name: create-ecr-repository - taskRef: - kind: Task - name: create-ecr-repository - runAfter: - - build - params: - - name: REPO_NAME - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME)" - - name: kaniko-build taskRef: kind: Task @@ -154,8 +144,14 @@ spec: runAfter: - create-ecr-repository params: - - name: IMAGE - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/$(params.CODEBASE_NAME):$(tasks.get-version.results.IS_TAG)" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" + - name: kaniko-cache-path + value: "kaniko-cache" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/templates/pipelines/gerrit-review-edp-tekton.yaml b/charts/custom-pipelines/templates/pipelines/gerrit-review-edp-tekton.yaml index c5dce492..7e0c6094 100644 --- a/charts/custom-pipelines/templates/pipelines/gerrit-review-edp-tekton.yaml +++ b/charts/custom-pipelines/templates/pipelines/gerrit-review-edp-tekton.yaml @@ -62,7 +62,7 @@ spec: kind: Task name: commit-validate runAfter: - - fetch-repository + - init-values params: - name: COMMIT_MESSAGE_PATTERN value: $(params.COMMIT_MESSAGE_PATTERN) diff --git a/charts/custom-pipelines/templates/pipelines/release/release-gerrit.yaml b/charts/custom-pipelines/templates/pipelines/release/release-gerrit.yaml index 14af4c04..50abffac 100644 --- a/charts/custom-pipelines/templates/pipelines/release/release-gerrit.yaml +++ b/charts/custom-pipelines/templates/pipelines/release/release-gerrit.yaml @@ -96,12 +96,12 @@ spec: runAfter: - fetch-repository params: - - name: IMAGE - value: "$(params.dockerhub-account)/$(params.codebase-name):$(params.version)" - - name: IMAGE_TAR - value: "$(params.codebase-name)_$(params.version)" - - name: KANIKO_CACHE_REPO - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/templates/pipelines/release/release-operators-headlamp-tekton.yaml b/charts/custom-pipelines/templates/pipelines/release/release-operators-headlamp-tekton.yaml index 11a8ddb9..8a56c3c3 100644 --- a/charts/custom-pipelines/templates/pipelines/release/release-operators-headlamp-tekton.yaml +++ b/charts/custom-pipelines/templates/pipelines/release/release-operators-headlamp-tekton.yaml @@ -142,12 +142,12 @@ spec: runAfter: - build params: - - name: IMAGE - value: "$(params.dockerhub-account)/$(params.codebase-name):$(params.version)" - - name: IMAGE_TAR - value: "$(params.codebase-name)_$(params.version)" - - name: KANIKO_CACHE_REPO - value: "$(tasks.init-values.results.DOCKER_REGISTRY_HOST)/kaniko-cache" + - name: codebase-name + value: "$(params.CODEBASE_NAME)" + - name: image-tag + value: "$(tasks.get-version.results.IS_TAG)" + - name: image-tar + value: "$(params.CODEBASE_NAME)_$(tasks.get-version.results.IS_TAG)" workspaces: - name: source workspace: shared-workspace diff --git a/charts/custom-pipelines/tests/test_edp_admin_console.py b/charts/custom-pipelines/tests/test_edp_admin_console.py index a6e5fb51..d16483d7 100644 --- a/charts/custom-pipelines/tests/test_edp_admin_console.py +++ b/charts/custom-pipelines/tests/test_edp_admin_console.py @@ -41,14 +41,13 @@ def test_operator(): assert "test" in b[6]["name"] assert "sonar" in b[7]["name"] assert "build" in b[8]["name"] - assert "create-ecr-repository" in b[9]["name"] - assert "kaniko-build" in b[10]["name"] - assert "ecr-to-docker" in b[11]["name"] - assert "set-version" in b[12]["name"] - assert "wait-for" in b[13]["name"] - assert "helm-push-gh-pages" in b[14]["name"] - assert "git-tag" in b[15]["name"] - assert "update-cbis" in b[16]["name"] + assert "kaniko-build" in b[9]["name"] + assert "ecr-to-docker" in b[10]["name"] + assert "set-version" in b[11]["name"] + assert "wait-for" in b[12]["name"] + assert "helm-push-gh-pages" in b[13]["name"] + assert "git-tag" in b[14]["name"] + assert "update-cbis" in b[15]["name"] assert "update-cbb" in ht["pipeline"][build]["spec"]["finally"][0]["name"] assert "push-to-jira" in ht["pipeline"][build]["spec"]["finally"][1]["name"] assert "send-to-microsoft-teams-failed" in ht["pipeline"][build]["spec"]["finally"][2]["name"] diff --git a/charts/custom-pipelines/tests/test_edp_container.py b/charts/custom-pipelines/tests/test_edp_container.py index 727e8391..c75f5a7d 100644 --- a/charts/custom-pipelines/tests/test_edp_container.py +++ b/charts/custom-pipelines/tests/test_edp_container.py @@ -21,7 +21,7 @@ def test_operator(): assert "init-values" in b[2]["name"] assert "get-version" in b[3]["name"] assert "dockerfile-lint" in b[4]["name"] - assert "create-ecr-repository" in b[5]["name"] + assert "kaniko-build" in b[5]["name"] assert "update-cbb" in ht["pipeline"][build]["spec"]["finally"][0]["name"] assert "push-to-jira" in ht["pipeline"][build]["spec"]["finally"][1]["name"] assert "send-to-microsoft-teams-failed" in ht["pipeline"][build]["spec"]["finally"][2]["name"] diff --git a/charts/custom-pipelines/tests/test_edp_tekton.py b/charts/custom-pipelines/tests/test_edp_tekton.py index fd977b04..40fc6fc1 100644 --- a/charts/custom-pipelines/tests/test_edp_tekton.py +++ b/charts/custom-pipelines/tests/test_edp_tekton.py @@ -25,14 +25,13 @@ def test_operator(): assert "test" in b[6]["name"] assert "sonar" in b[7]["name"] assert "build" in b[8]["name"] - assert "create-ecr-repository" in b[9]["name"] - assert "kaniko-build" in b[10]["name"] - assert "ecr-to-docker" in b[11]["name"] - assert "set-version" in b[12]["name"] - assert "wait-for" in b[13]["name"] - assert "helm-push-gh-pages" in b[14]["name"] - assert "git-tag" in b[15]["name"] - assert "update-cbis" in b[16]["name"] + assert "kaniko-build" in b[9]["name"] + assert "ecr-to-docker" in b[10]["name"] + assert "set-version" in b[11]["name"] + assert "wait-for" in b[12]["name"] + assert "helm-push-gh-pages" in b[13]["name"] + assert "git-tag" in b[14]["name"] + assert "update-cbis" in b[15]["name"] assert "update-cbb" in ht["pipeline"][build]["spec"]["finally"][0]["name"] assert "push-to-jira" in ht["pipeline"][build]["spec"]["finally"][1]["name"] assert "send-to-microsoft-teams-failed" in ht["pipeline"][build]["spec"]["finally"][2]["name"] diff --git a/charts/custom-pipelines/tests/test_headlamp.py b/charts/custom-pipelines/tests/test_headlamp.py index 519dd72b..6d0823f8 100644 --- a/charts/custom-pipelines/tests/test_headlamp.py +++ b/charts/custom-pipelines/tests/test_headlamp.py @@ -46,14 +46,13 @@ def test_operator(): assert "build" in b[7]["name"] assert "test" in b[8]["name"] assert "sonar" in b[9]["name"] - assert "create-ecr-repository" in b[10]["name"] - assert "kaniko-build" in b[11]["name"] - assert "ecr-to-docker" in b[12]["name"] - assert "set-version" in b[13]["name"] - assert "wait-for" in b[14]["name"] - assert "helm-push-gh-pages" in b[15]["name"] - assert "git-tag" in b[16]["name"] - assert "update-cbis" in b[17]["name"] + assert "kaniko-build" in b[10]["name"] + assert "ecr-to-docker" in b[11]["name"] + assert "set-version" in b[12]["name"] + assert "wait-for" in b[13]["name"] + assert "helm-push-gh-pages" in b[14]["name"] + assert "git-tag" in b[15]["name"] + assert "update-cbis" in b[16]["name"] assert "update-cbb" in ht["pipeline"][build]["spec"]["finally"][0]["name"] assert "push-to-jira" in ht["pipeline"][build]["spec"]["finally"][1]["name"] assert "send-to-microsoft-teams-failed" in ht["pipeline"][build]["spec"]["finally"][2]["name"] diff --git a/charts/custom-pipelines/tests/test_keycloak_operator.py b/charts/custom-pipelines/tests/test_keycloak_operator.py index 57269845..ecd44bca 100644 --- a/charts/custom-pipelines/tests/test_keycloak_operator.py +++ b/charts/custom-pipelines/tests/test_keycloak_operator.py @@ -45,14 +45,13 @@ def test_keycloak_operator(): assert "test" in b[6]["name"] assert "sonar" in b[7]["name"] assert "build" in b[8]["name"] - assert "create-ecr-repository" in b[9]["name"] - assert "kaniko-build" in b[10]["name"] - assert "ecr-to-docker" in b[11]["name"] - assert "set-version" in b[12]["name"] - assert "wait-for" in b[13]["name"] - assert "helm-push-gh-pages" in b[14]["name"] - assert "git-tag" in b[15]["name"] - assert "update-cbis" in b[16]["name"] + assert "kaniko-build" in b[9]["name"] + assert "ecr-to-docker" in b[10]["name"] + assert "set-version" in b[11]["name"] + assert "wait-for" in b[12]["name"] + assert "helm-push-gh-pages" in b[13]["name"] + assert "git-tag" in b[14]["name"] + assert "update-cbis" in b[15]["name"] assert "update-cbb" in ht["pipeline"][build]["spec"]["finally"][0]["name"] assert "push-to-jira" in ht["pipeline"][build]["spec"]["finally"][1]["name"] assert "send-to-microsoft-teams-failed" in ht["pipeline"][build]["spec"]["finally"][2]["name"] diff --git a/charts/custom-pipelines/tests/test_operator.py b/charts/custom-pipelines/tests/test_operator.py index 066ede3f..04af7ea6 100644 --- a/charts/custom-pipelines/tests/test_operator.py +++ b/charts/custom-pipelines/tests/test_operator.py @@ -44,14 +44,13 @@ def test_operator(): assert "test" in b[6]["name"] assert "sonar" in b[7]["name"] assert "build" in b[8]["name"] - assert "create-ecr-repository" in b[9]["name"] - assert "kaniko-build" in b[10]["name"] - assert "ecr-to-docker" in b[11]["name"] - assert "set-version" in b[12]["name"] - assert "wait-for" in b[13]["name"] - assert "helm-push-gh-pages" in b[14]["name"] - assert "git-tag" in b[15]["name"] - assert "update-cbis" in b[16]["name"] + assert "kaniko-build" in b[9]["name"] + assert "ecr-to-docker" in b[10]["name"] + assert "set-version" in b[11]["name"] + assert "wait-for" in b[12]["name"] + assert "helm-push-gh-pages" in b[13]["name"] + assert "git-tag" in b[14]["name"] + assert "update-cbis" in b[15]["name"] assert "update-cbb" in ht["pipeline"][build]["spec"]["finally"][0]["name"] assert "push-to-jira" in ht["pipeline"][build]["spec"]["finally"][1]["name"] assert "send-to-microsoft-teams-failed" in ht["pipeline"][build]["spec"]["finally"][2]["name"] diff --git a/charts/custom-pipelines/tests/test_sonar_operator.py b/charts/custom-pipelines/tests/test_sonar_operator.py index 4205bd47..576f8a07 100644 --- a/charts/custom-pipelines/tests/test_sonar_operator.py +++ b/charts/custom-pipelines/tests/test_sonar_operator.py @@ -45,14 +45,13 @@ def test_operator(): assert "test" in b[6]["name"] assert "sonar" in b[7]["name"] assert "build" in b[8]["name"] - assert "create-ecr-repository" in b[9]["name"] - assert "kaniko-build" in b[10]["name"] - assert "ecr-to-docker" in b[11]["name"] - assert "set-version" in b[12]["name"] - assert "wait-for" in b[13]["name"] - assert "helm-push-gh-pages" in b[14]["name"] - assert "git-tag" in b[15]["name"] - assert "update-cbis" in b[16]["name"] + assert "kaniko-build" in b[9]["name"] + assert "ecr-to-docker" in b[10]["name"] + assert "set-version" in b[11]["name"] + assert "wait-for" in b[12]["name"] + assert "helm-push-gh-pages" in b[13]["name"] + assert "git-tag" in b[14]["name"] + assert "update-cbis" in b[15]["name"] assert "update-cbb" in ht["pipeline"][build]["spec"]["finally"][0]["name"] assert "push-to-jira" in ht["pipeline"][build]["spec"]["finally"][1]["name"] assert "send-to-microsoft-teams-failed" in ht["pipeline"][build]["spec"]["finally"][2]["name"]