From 29952d4817e62013636658a27895c75405458fcf Mon Sep 17 00:00:00 2001 From: Luiz Carvalho Date: Oct 25 2019 20:21:21 +0000 Subject: Use the correct secret for registry push Signed-off-by: Luiz Carvalho --- diff --git a/openshift/docs/pipeline-deployment.md b/openshift/docs/pipeline-deployment.md index 4d913d4..da9a162 100644 --- a/openshift/docs/pipeline-deployment.md +++ b/openshift/docs/pipeline-deployment.md @@ -95,9 +95,9 @@ To publish the container built by the pipeline, you need to set up a secret for - Please go to your registry dashboard and create a robot account. - Backup your docker-config-json file (`$HOME/.docker/config.json`) if present. - Run `docker login` with the robot account you just created to produce a new docker-config-json file. -- Create a new [OpenShift secret for registries][] named `factory2-psi-registry-credentials` from your docker-config-json file: +- Create a new [OpenShift secret for registries][] named `factory2-pipeline-registry-credentials` from your docker-config-json file: ```bash - oc create secret generic factory2-psi-registry-credentials \ + oc create secret generic factory2-pipeline-registry-credentials \ --from-file=.dockerconfigjson="$HOME/.docker/config.json" \ --type=kubernetes.io/dockerconfigjson ``` diff --git a/openshift/pipelines/templates/waiverdb-build-template.yaml b/openshift/pipelines/templates/waiverdb-build-template.yaml index 0b6b148..27c423a 100644 --- a/openshift/pipelines/templates/waiverdb-build-template.yaml +++ b/openshift/pipelines/templates/waiverdb-build-template.yaml @@ -70,7 +70,7 @@ parameters: value: "quay.io/factory2/waiverdb" - name: CONTAINER_REGISTRY_CREDENTIALS displayName: Secret name of container registries used for pulling and pushing images - value: factory2-psi-registry-credentials + value: factory2-pipeline-registry-credentials required: false - name: WAIVERDB_DEV_IMAGE_TAG displayName: Tag name of the resulting container image for development environment diff --git a/openshift/pipelines/templates/waiverdb-full-integration-test-template.yaml b/openshift/pipelines/templates/waiverdb-full-integration-test-template.yaml index 6b1b6f9..e0423a4 100644 --- a/openshift/pipelines/templates/waiverdb-full-integration-test-template.yaml +++ b/openshift/pipelines/templates/waiverdb-full-integration-test-template.yaml @@ -33,7 +33,7 @@ parameters: value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest - name: CONTAINER_REGISTRY_CREDENTIALS displayName: Secret name of container registries used for pulling and pushing images - value: factory2-psi-registry-credentials + value: factory2-pipeline-registry-credentials required: false - name: JENKINS_AGENT_CLOUD_NAME displayName: Name of OpenShift cloud in Jenkins master configuration diff --git a/openshift/pipelines/templates/waiverdb-image-promotion-template.yaml b/openshift/pipelines/templates/waiverdb-image-promotion-template.yaml index 22f43bd..2575933 100644 --- a/openshift/pipelines/templates/waiverdb-image-promotion-template.yaml +++ b/openshift/pipelines/templates/waiverdb-image-promotion-template.yaml @@ -26,7 +26,7 @@ parameters: value: "quay.io/factory2/waiverdb" - name: CONTAINER_REGISTRY_CREDENTIALS displayName: Secret name of container registries used for pulling and pushing images - value: factory2-psi-registry-credentials + value: factory2-pipeline-registry-credentials required: false - name: TAG_INTO_IMAGESTREAM displayName: Whether to tag the image into an ImageStream diff --git a/openshift/pipelines/templates/waiverdb-integration-test-template.yaml b/openshift/pipelines/templates/waiverdb-integration-test-template.yaml index 17b5412..696f9e4 100644 --- a/openshift/pipelines/templates/waiverdb-integration-test-template.yaml +++ b/openshift/pipelines/templates/waiverdb-integration-test-template.yaml @@ -33,7 +33,7 @@ parameters: value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest - name: CONTAINER_REGISTRY_CREDENTIALS displayName: Secret name of container registries used for pulling and pushing images - value: factory2-psi-registry-credentials + value: factory2-pipeline-registry-credentials required: false - name: JENKINS_AGENT_CLOUD_NAME displayName: Name of OpenShift cloud in Jenkins master configuration