refactor: Align labels, name convention (#145)

Change-Id: I86ef7ee16ebd221ec5421fa83e2493805d42d0d0
epam · Mar 7, 2024 · 637b9ad · 637b9ad
1 parent b825f81
commit 637b9ad
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 58 deletions.
diff --git a/.../pipelines/cd/cd-stage-deploy-custom.yaml → ...templates/pipelines/cd/deploy-custom.yaml b/.../pipelines/cd/cd-stage-deploy-custom.yaml → ...templates/pipelines/cd/deploy-custom.yaml
@@ -1,9 +1,8 @@
 apiVersion: tekton.dev/v1
 kind: Pipeline
 metadata:
-  name: cd-stage-deploy-custom
+  name: deploy-custom
   labels:
-    app.edp.epam.com/pipeline: general-deployment
     app.edp.epam.com/pipelinetype: deploy
 spec:
   description: |

diff --git a/charts/pipelines-library/templates/pipelines/cd/cd-pipeline.yaml b/charts/pipelines-library/templates/pipelines/cd/cd-pipeline.yaml
diff --git a/...es/pipelines/cd/cd-stage-deploy-auto.yaml → ...s/pipelines/cd/deploy-with-autotests.yaml b/...es/pipelines/cd/cd-stage-deploy-auto.yaml → ...s/pipelines/cd/deploy-with-autotests.yaml
@@ -1,9 +1,8 @@
 apiVersion: tekton.dev/v1
 kind: Pipeline
 metadata:
-  name: cd-stage-deploy-auto
+  name: deploy-with-autotests
   labels:
-    app.edp.epam.com/pipeline: general-deployment
     app.edp.epam.com/pipelinetype: deploy
 spec:
   description: |

diff --git a/...mplates/pipelines/cd/cd-stage-deploy.yaml → ...ibrary/templates/pipelines/cd/deploy.yaml b/...mplates/pipelines/cd/cd-stage-deploy.yaml → ...ibrary/templates/pipelines/cd/deploy.yaml
@@ -1,9 +1,8 @@
 apiVersion: tekton.dev/v1
 kind: Pipeline
 metadata:
-  name: cd-stage-deploy
+  name: deploy
   labels:
-    app.edp.epam.com/pipeline: general-deployment
     app.edp.epam.com/pipelinetype: deploy
 spec:
   description: |

diff --git a/.../triggers/cd/tt-cd-stage-deploy-auto.yaml → ...es/triggers/cd/deploy-with-autotests.yaml b/.../triggers/cd/tt-cd-stage-deploy-auto.yaml → ...es/triggers/cd/deploy-with-autotests.yaml
@@ -1,7 +1,7 @@
 apiVersion: triggers.tekton.dev/v1beta1
 kind: TriggerTemplate
 metadata:
-  name: cd-stage-deploy-auto
+  name: deploy-with-autotests
   labels:
     app.edp.epam.com/pipelinetype: deploy
 spec:
@@ -30,7 +30,7 @@ spec:
         taskRunTemplate:
           serviceAccountName: tekton
         pipelineRef:
-          name: cd-stage-deploy-auto
+          name: deploy-with-autotests
         params:
           - name: APPLICATIONS_PAYLOAD
             value: $(tt.params.APPLICATIONS_PAYLOAD)

diff --git a/...lates/triggers/cd/tt-cd-stage-deploy.yaml → ...library/templates/triggers/cd/deploy.yaml b/...lates/triggers/cd/tt-cd-stage-deploy.yaml → ...library/templates/triggers/cd/deploy.yaml
@@ -1,7 +1,7 @@
 apiVersion: triggers.tekton.dev/v1beta1
 kind: TriggerTemplate
 metadata:
-  name: cd-stage-deploy
+  name: deploy
   labels:
     app.edp.epam.com/pipelinetype: deploy
 spec:
@@ -30,7 +30,7 @@ spec:
         taskRunTemplate:
           serviceAccountName: tekton
         pipelineRef:
-          name: cd-stage-deploy
+          name: deploy
         params:
           - name: APPLICATIONS_PAYLOAD
             value: $(tt.params.APPLICATIONS_PAYLOAD)

diff --git a/charts/pipelines-library/tests/test_gerrit_integration.py b/charts/pipelines-library/tests/test_gerrit_integration.py
@@ -12,7 +12,8 @@ def test_gerrit_is_disabled():
 
     assert "eventlistener" not in r
     assert "triggerbinding" not in r
-    assert "cdpipeline" in r["pipeline"]
+    assert "deploy" in r["pipeline"]
+    assert "deploy-with-autotests" in r["pipeline"]
     assert "gitserver" not in r