From: David Galloway <dgallowa@redhat.com>
Date: Tue, 16 Jun 2020 21:32:53 +0000 (-0400)
Subject: ceph-dev*/quay*: Use our own quay.ceph.io registry
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e8e32d6a54243279247bbed99209b87ac971977;p=ceph-build.git

ceph-dev*/quay*: Use our own quay.ceph.io registry

This will have to be overridden in ceph.git/qa as well.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index a20c5fd8..98d550df 100644
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -73,7 +73,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - string:
           name: CONTAINER_REPO_HOSTNAME
           description: "For CI_CONTAINER: Name of container repo server (i.e. 'quay.io')"
-          default: "quay.io"
+          default: "quay.ceph.io"
 
       - string:
           name: CONTAINER_REPO_ORGANIZATION
diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index f38c3f3c..6feae5a5 100644
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -72,7 +72,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - string:
           name: CONTAINER_REPO_HOSTNAME
           description: "For CI_CONTAINER: Name of container repo server (i.e. 'quay.io')"
-          default: "quay.io"
+          default: "quay.ceph.io"
 
       - string:
           name: CONTAINER_REPO_ORGANIZATION
diff --git a/quay-pruner/build/prune-quay.py b/quay-pruner/build/prune-quay.py
index d6f5a4bd..46537742 100755
--- a/quay-pruner/build/prune-quay.py
+++ b/quay-pruner/build/prune-quay.py
@@ -6,7 +6,7 @@ import re
 import requests
 import sys
 
-QUAYBASE = "https://quay.io/api/v1"
+QUAYBASE = "https://quay.ceph.io/api/v1"
 REPO = "ceph-ci/ceph"
 
 
diff --git a/quay-pruner/config/definitions/quay-pruner.yml b/quay-pruner/config/definitions/quay-pruner.yml
index 63ef4057..cf982291 100644
--- a/quay-pruner/config/definitions/quay-pruner.yml
+++ b/quay-pruner/config/definitions/quay-pruner.yml
@@ -44,5 +44,5 @@
           mask-password-params: true
       - credentials-binding:
           - text:
-              credential-id: quay-api-token
+              credential-id: quay-dot-ceph-dot-io-pruner-token
               variable: QUAYTOKEN