Skip to content

Commit 541d1f7

Browse files
author
oleksandr_taruraiev
committed
chore: Enable deployment env variables in CD pipelines(#360)
1 parent ee79043 commit 541d1f7

File tree

14 files changed

+107
-12
lines changed

14 files changed

+107
-12
lines changed

charts/pipelines-library/templates/pipelines/cd-autotests/autotest.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ spec:
2121
default: "master"
2222
- name: stage-name
2323
default: "dev"
24+
- name: cd-pipeline-name
25+
default: "dev"
2426
- name: base-image
2527
default: ""
2628
tasks:

charts/pipelines-library/templates/pipelines/cd/clean.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ spec:
2929
kind: Task
3030
name: run-clean-gate
3131
params:
32+
- name: PIPELINE
33+
value: $(params.CDPIPELINE)
34+
- name: STAGE
35+
value: $(params.CDSTAGE)
3236
- name: KUBECONFIG_SECRET_NAME
3337
value: $(params.KUBECONFIG_SECRET_NAME)
3438
- name: BASE_IMAGE
@@ -56,6 +60,10 @@ spec:
5660
runAfter:
5761
- clean
5862
params:
63+
- name: PIPELINE
64+
value: $(params.CDPIPELINE)
65+
- name: STAGE
66+
value: $(params.CDSTAGE)
5967
- name: KUBECONFIG_SECRET_NAME
6068
value: $(params.KUBECONFIG_SECRET_NAME)
6169
- name: BASE_IMAGE

charts/pipelines-library/templates/pipelines/cd/deploy-ansible-awx.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ spec:
3535
kind: Task
3636
name: run-quality-gate
3737
params:
38+
- name: PIPELINE
39+
value: $(params.CDPIPELINE)
40+
- name: STAGE
41+
value: $(params.CDSTAGE)
3842
- name: BASE_IMAGE
39-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
43+
value: "bitnami/kubectl:1.25.4"
4044
- name: EXTRA_COMMANDS
4145
value:
4246
echo "Hello World"
@@ -62,8 +66,12 @@ spec:
6266
runAfter:
6367
- deploy-app
6468
params:
69+
- name: PIPELINE
70+
value: $(params.CDPIPELINE)
71+
- name: STAGE
72+
value: $(params.CDSTAGE)
6573
- name: BASE_IMAGE
66-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
74+
value: "bitnami/kubectl:1.25.4"
6775
- name: EXTRA_COMMANDS
6876
value:
6977
echo "Hello World"
@@ -75,6 +83,10 @@ spec:
7583
runAfter:
7684
- post-deploy
7785
params:
86+
- name: PIPELINE
87+
value: $(params.CDPIPELINE)
88+
- name: STAGE
89+
value: $(params.CDSTAGE)
7890
- name: APPLICATIONS_PAYLOAD
7991
value: $(params.APPLICATIONS_PAYLOAD)
8092
- name: CDPIPELINE_STAGE

charts/pipelines-library/templates/pipelines/cd/deploy-ansible.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ spec:
3131
kind: Task
3232
name: run-quality-gate
3333
params:
34+
- name: PIPELINE
35+
value: $(params.CDPIPELINE)
36+
- name: STAGE
37+
value: $(params.CDSTAGE)
3438
- name: BASE_IMAGE
35-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
39+
value: "bitnami/kubectl:1.25.4"
3640
- name: EXTRA_COMMANDS
3741
value:
3842
echo "Hello World"
@@ -58,8 +62,12 @@ spec:
5862
runAfter:
5963
- deploy-app
6064
params:
65+
- name: PIPELINE
66+
value: $(params.CDPIPELINE)
67+
- name: STAGE
68+
value: $(params.CDSTAGE)
6169
- name: BASE_IMAGE
62-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
70+
value: "bitnami/kubectl:1.25.4"
6371
- name: EXTRA_COMMANDS
6472
value:
6573
echo "Hello World"

charts/pipelines-library/templates/pipelines/cd/deploy-with-approve.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,14 @@ spec:
3636
kind: Task
3737
name: run-quality-gate
3838
params:
39+
- name: PIPELINE
40+
value: $(params.CDPIPELINE)
41+
- name: STAGE
42+
value: $(params.CDSTAGE)
3943
- name: KUBECONFIG_SECRET_NAME
4044
value: $(params.KUBECONFIG_SECRET_NAME)
4145
- name: BASE_IMAGE
42-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
46+
value: "bitnami/kubectl:1.25.4"
4347
- name: EXTRA_COMMANDS
4448
value:
4549
echo "Hello World"

charts/pipelines-library/templates/pipelines/cd/deploy-with-autotests.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,14 @@ spec:
4242
kind: Task
4343
name: run-quality-gate
4444
params:
45+
- name: PIPELINE
46+
value: $(params.CDPIPELINE)
47+
- name: STAGE
48+
value: $(params.CDSTAGE)
4549
- name: KUBECONFIG_SECRET_NAME
4650
value: $(params.KUBECONFIG_SECRET_NAME)
4751
- name: BASE_IMAGE
48-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
52+
value: "bitnami/kubectl:1.25.4"
4953
- name: EXTRA_COMMANDS
5054
value:
5155
echo "Hello World"
@@ -71,10 +75,14 @@ spec:
7175
runAfter:
7276
- deploy-app
7377
params:
78+
- name: PIPELINE
79+
value: $(params.CDPIPELINE)
80+
- name: STAGE
81+
value: $(params.CDSTAGE)
7482
- name: KUBECONFIG_SECRET_NAME
7583
value: $(params.KUBECONFIG_SECRET_NAME)
7684
- name: BASE_IMAGE
77-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
85+
value: "bitnami/kubectl:1.25.4"
7886
- name: EXTRA_COMMANDS
7987
value:
8088
echo "Hello World"

charts/pipelines-library/templates/pipelines/cd/deploy.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ spec:
3434
kind: Task
3535
name: run-quality-gate
3636
params:
37+
- name: PIPELINE
38+
value: $(params.CDPIPELINE)
39+
- name: STAGE
40+
value: $(params.CDSTAGE)
3741
- name: KUBECONFIG_SECRET_NAME
3842
value: $(params.KUBECONFIG_SECRET_NAME)
3943
- name: BASE_IMAGE
40-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
44+
value: "bitnami/kubectl:1.25.4"
4145
- name: EXTRA_COMMANDS
4246
value:
4347
echo "Hello World"
@@ -63,10 +67,14 @@ spec:
6367
runAfter:
6468
- deploy-app
6569
params:
70+
- name: PIPELINE
71+
value: $(params.CDPIPELINE)
72+
- name: STAGE
73+
value: $(params.CDSTAGE)
6674
- name: KUBECONFIG_SECRET_NAME
6775
value: $(params.KUBECONFIG_SECRET_NAME)
6876
- name: BASE_IMAGE
69-
value: "{{ include "edp-tekton.registry" . }}/bitnami/kubectl:1.25.4"
77+
value: "bitnami/kubectl:1.25.4"
7078
- name: EXTRA_COMMANDS
7179
value:
7280
echo "Hello World"

charts/pipelines-library/templates/tasks/autotest-cd-pipeline/init-autotests.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
type: string
3131
steps:
3232
- name: init-autotest
33-
image: {{ include "edp-tekton.registry" . }}/epamedp/tekton-autotest:0.1.3
33+
image: epamedp/tekton-autotest:0.1.3
3434
workingDir: $(workspaces.source.path)
3535
volumeMounts:
3636
- name: autotests-workspace-template
@@ -46,7 +46,9 @@ spec:
4646
value: $(params.cd-pipeline-name)
4747
- name: PARENT_PIPELINE_NAME
4848
value: $(params.parent-pipeline-name)
49-
49+
envFrom:
50+
- configMapRef:
51+
name: $(params.cd-pipeline-name)-$(params.stage-name)
5052
script: |
5153
#!/usr/bin/env python
5254
@@ -103,6 +105,7 @@ spec:
103105
-p git-source-url=" + gitAutotesUrl[count] + " \
104106
-p git-source-revision=" + autotestsBranch[count] + " \
105107
-p stage-name=" + stage +" \
108+
-p cd-pipeline-name=" + cdPipelineName +" \
106109
-p base-image=" + frameworks[autotestBuildTool[count] + "-" + autotestFramework[count]] + " \
107110
--labels app.edp.epam.com/pipeline=" + cdPipelineName + " \
108111
--labels app.edp.epam.com/stage=" + stage + " \

charts/pipelines-library/templates/tasks/autotest-cd-pipeline/run-autotests-java.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ spec:
1919
- name: source
2020
description: A workspace that contains the repository.
2121
params:
22+
- name: cd-pipeline-name
23+
type: string
2224
- name: stage-name
2325
type: string
2426
- name: base-image
@@ -30,6 +32,11 @@ spec:
3032
env:
3133
- name: STAGE_NAME
3234
value: $(params.stage-name)
35+
- name: CD_PIPELINE_NAME
36+
value: $(params.cd-pipeline-name)
37+
envFrom:
38+
- configMapRef:
39+
name: $(params.cd-pipeline-name)-$(params.stage-name)
3340
script: |
3441
#!/bin/bash
3542

charts/pipelines-library/templates/tasks/cd/clean.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
secretKeyRef:
3030
name: ci-argocd
3131
key: token
32+
envFrom:
33+
- configMapRef:
34+
name: $(params.PIPELINE)-$(params.STAGE)
3235
script: |
3336
set -ex
3437

0 commit comments

Comments
 (0)