From b34c3ff47c4b03dbff02e55c0e9ef467c769a9b4 Mon Sep 17 00:00:00 2001 From: Luiz Carvalho Date: Oct 23 2019 21:39:46 +0000 Subject: Use the new internal container registry for C3I Signed-off-by: Luiz Carvalho --- diff --git a/openshift/docs/pipeline-deployment.md b/openshift/docs/pipeline-deployment.md index da9a162..4d913d4 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-pipeline-registry-credentials` from your docker-config-json file: +- Create a new [OpenShift secret for registries][] named `factory2-psi-registry-credentials` from your docker-config-json file: ```bash - oc create secret generic factory2-pipeline-registry-credentials \ + oc create secret generic factory2-psi-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 998ce68..0b6b148 100644 --- a/openshift/pipelines/templates/waiverdb-build-template.yaml +++ b/openshift/pipelines/templates/waiverdb-build-template.yaml @@ -53,7 +53,7 @@ parameters: - name: JENKINS_AGENT_IMAGE displayName: Container image for Jenkins slave pods required: true - value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest + value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest - name: PAGURE_DOC_REPO_NAME displayName: namespace/project of Pagure doc repo for publishing docs description: If not emptry, docs will be published to the specified Pagure doc repo when this is a post-merge build @@ -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-pipeline-registry-credentials + value: factory2-psi-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 f7c190b..6b1b6f9 100644 --- a/openshift/pipelines/templates/waiverdb-full-integration-test-template.yaml +++ b/openshift/pipelines/templates/waiverdb-full-integration-test-template.yaml @@ -30,10 +30,10 @@ parameters: - name: JENKINS_AGENT_IMAGE displayName: Container image for Jenkins slave pods required: true - value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest + 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-pipeline-registry-credentials + value: factory2-psi-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-greenwave-trigger.yaml b/openshift/pipelines/templates/waiverdb-greenwave-trigger.yaml index 89e6ac4..77ae946 100644 --- a/openshift/pipelines/templates/waiverdb-greenwave-trigger.yaml +++ b/openshift/pipelines/templates/waiverdb-greenwave-trigger.yaml @@ -43,7 +43,7 @@ parameters: value: "Consumer.rh-jenkins-ci-plugin.c3i-greenwave-trigger.VirtualTopic.eng.greenwave.decision.update" - name: JENKINS_AGENT_IMAGE displayName: Container image for Jenkins slave pods - value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest + value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest - name: OPENSHIFT_CLOUD_NAME displayName: Name of OpenShift cloud in Jenkins master configuration value: openshift diff --git a/openshift/pipelines/templates/waiverdb-image-promotion-template.yaml b/openshift/pipelines/templates/waiverdb-image-promotion-template.yaml index f799df7..22f43bd 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-pipeline-registry-credentials + value: factory2-psi-registry-credentials required: false - name: TAG_INTO_IMAGESTREAM displayName: Whether to tag the image into an ImageStream @@ -58,7 +58,7 @@ parameters: - name: JENKINS_AGENT_IMAGE displayName: Container image for Jenkins slave pods required: true - value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest + value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest - name: JENKINS_AGENT_CLOUD_NAME displayName: Name of OpenShift cloud in Jenkins master configuration required: true diff --git a/openshift/pipelines/templates/waiverdb-integration-test-template.yaml b/openshift/pipelines/templates/waiverdb-integration-test-template.yaml index 17021ee..17b5412 100644 --- a/openshift/pipelines/templates/waiverdb-integration-test-template.yaml +++ b/openshift/pipelines/templates/waiverdb-integration-test-template.yaml @@ -30,10 +30,10 @@ parameters: - name: JENKINS_AGENT_IMAGE displayName: Container image for Jenkins slave pods required: true - value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest + 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-pipeline-registry-credentials + value: factory2-psi-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-polling-pagure.yaml b/openshift/pipelines/templates/waiverdb-polling-pagure.yaml index 137ce28..50f077d 100644 --- a/openshift/pipelines/templates/waiverdb-polling-pagure.yaml +++ b/openshift/pipelines/templates/waiverdb-polling-pagure.yaml @@ -53,7 +53,7 @@ parameters: - name: JENKINS_AGENT_IMAGE displayName: Container image for Jenkins slave pods required: true - value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest + value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest - name: OPENSHIFT_CLOUD_NAME displayName: Name of OpenShift cloud in Jenkins master configuration required: true diff --git a/openshift/pipelines/templates/waiverdb-repotracker-trigger.yaml b/openshift/pipelines/templates/waiverdb-repotracker-trigger.yaml index d4d1d2f..0b0caa0 100644 --- a/openshift/pipelines/templates/waiverdb-repotracker-trigger.yaml +++ b/openshift/pipelines/templates/waiverdb-repotracker-trigger.yaml @@ -28,7 +28,7 @@ parameters: required: true - name: JENKINS_AGENT_IMAGE displayName: Container image for Jenkins slave pods - value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest + value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest - name: OPENSHIFT_CLOUD_NAME displayName: Name of OpenShift cloud in Jenkins master configuration value: openshift