chore: Align cutom-pipeline for new kaniko approach (#47)

Jira EPMDEDP-12618
Related #47

Change-Id: I56c06eeacd44d5f29502e243578fbc9102b277f4

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

charts/custom-pipelines/templates/pipelines/gerrit-build-container-edp.yaml

@@ -69,26 +69,21 @@ 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
       runAfter:
         - 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

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

charts/custom-pipelines/templates/pipelines/gerrit-build-headlamp-edp.yaml

@@ -151,27 +151,21 @@ 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
         name: kaniko
       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

charts/custom-pipelines/templates/pipelines/gerrit-build-keycloak-operator-edp.yaml

@@ -137,25 +137,21 @@ 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
         name: kaniko
       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

charts/custom-pipelines/templates/pipelines/gerrit-build-operator-edp.yaml

@@ -137,25 +137,21 @@ 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
         name: kaniko
       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

charts/custom-pipelines/templates/pipelines/gerrit-build-sonar-operator-edp.yaml

@@ -137,25 +137,21 @@ 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
         name: kaniko
       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

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)

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

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

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"]

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"]

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"]

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"]

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"]