Skip to content

Commit 1fd5a73

Browse files
authored
Merge pull request #180 from tnevrlka/azure-image-registry-var
Uncomment IMAGE_REGISTRY_PASSWORD in Azure GitOps
2 parents 4fbfb72 + 9d9fc5b commit 1fd5a73

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

generated/gitops-template/azure/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ steps:
3131
env:
3232
TRUSTIFICATION_OIDC_CLIENT_SECRET: $(TRUSTIFICATION_OIDC_CLIENT_SECRET)
3333
# Set this password for your specific registry
34-
# IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)
34+
IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)
3535
# QUAY_IO_CREDS_PSW: $(QUAY_IO_CREDS_PSW)
3636
# ARTIFACTORY_IO_CREDS_PSW: $(ARTIFACTORY_IO_CREDS_PSW)
3737
# NEXUS_IO_CREDS_PSW: $(NEXUS_IO_CREDS_PSW)
@@ -46,7 +46,7 @@ steps:
4646
env:
4747
TRUSTIFICATION_OIDC_CLIENT_SECRET: $(TRUSTIFICATION_OIDC_CLIENT_SECRET)
4848
# Set this password for your specific registry
49-
# IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)
49+
IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)
5050
# QUAY_IO_CREDS_PSW: $(QUAY_IO_CREDS_PSW)
5151
# ARTIFACTORY_IO_CREDS_PSW: $(ARTIFACTORY_IO_CREDS_PSW)
5252
# NEXUS_IO_CREDS_PSW: $(NEXUS_IO_CREDS_PSW)

hack/copy-to-tssc-templates

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ rm -rf $JENKINS_SHARED_LIB/resources/env.template.sh
7070
rm -rf $JENKINS_SHARED_LIB/resources/signing-secret-env.sh
7171

7272
# templates are copied 1-1
73-
for ciType in jenkins gitlabci githubactions; do
73+
for ciType in jenkins gitlabci githubactions azure; do
7474
update-tssc-templates $CI_ROOT_SRC $ciType rhtap/env.template.sh $GEN_SRC
7575
update-tssc-templates $CI_ROOT_GITOPS $ciType rhtap/env.template.sh $GEN_GITOPS
7676
done

templates/data.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ gitops_variables:
160160
gitops_secrets:
161161
- name: TRUSTIFICATION_OIDC_CLIENT_SECRET
162162
- name: IMAGE_REGISTRY_PASSWORD
163-
if: 'isGitHub'
163+
if: 'isGitHub || isAzure'
164164
comment: "Set this password for your specific registry"
165165
- name: IMAGE_REGISTRY_PASSWORD
166-
if: '!isGitHub'
166+
if: '!isGitHub && !isAzure'
167167
commented_out: true
168168
comment: "Set this password for your specific registry"
169169
# show all the values options in the jenkins file and other CIs

0 commit comments

Comments
 (0)