ci: migrate to new OpenShift cluster running on AWS

Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2023-03-17 17:52:29 +01:00 committed by mergify[bot]
parent 234471af33
commit 8135680065
9 changed files with 15 additions and 15 deletions

View File

@ -9,7 +9,7 @@ def git_since = 'ci/centos'
def base = '' def base = ''
def doc_change = 0 def doc_change = 0
// private, internal container image repository // private, internal container image repository
def ci_registry = 'registry-ceph-csi.apps.ocp.ci.centos.org' def ci_registry = 'registry-ceph-csi.apps.ocp.cloud.ci.centos.org'
def cached_image = 'ceph-csi' def cached_image = 'ceph-csi'
def use_pulled_image = 'USE_PULLED_IMAGE=yes' def use_pulled_image = 'USE_PULLED_IMAGE=yes'

View File

@ -9,7 +9,7 @@ def git_since = 'devel'
def workdir = '/opt/build/go/src/github.com/ceph/ceph-csi' def workdir = '/opt/build/go/src/github.com/ceph/ceph-csi'
def doc_change = 0 def doc_change = 0
// private, internal container image repository // private, internal container image repository
def ci_registry = 'registry-ceph-csi.apps.ocp.ci.centos.org' def ci_registry = 'registry-ceph-csi.apps.ocp.cloud.ci.centos.org'
def cached_image = "ceph-csi" def cached_image = "ceph-csi"
def use_test_image = 'USE_PULLED_IMAGE=yes' def use_test_image = 'USE_PULLED_IMAGE=yes'
def use_build_image = 'USE_PULLED_IMAGE=yes' def use_build_image = 'USE_PULLED_IMAGE=yes'

View File

@ -1,5 +1,5 @@
--- ---
apiVersion: v1 apiVersion: build.openshift.io/v1
kind: BuildConfig kind: BuildConfig
metadata: metadata:
name: ceph-csi-canary name: ceph-csi-canary
@ -21,11 +21,11 @@ spec:
output: output:
to: to:
kind: DockerImage kind: DockerImage
name: registry-ceph-csi.apps.ocp.ci.centos.org/ceph-csi:canary name: registry-ceph-csi.apps.ocp.cloud.ci.centos.org/ceph-csi:canary
pushSecret: pushSecret:
name: container-registry-auth name: container-registry-auth
--- ---
apiVersion: v1 apiVersion: build.openshift.io/v1
kind: BuildConfig kind: BuildConfig
metadata: metadata:
name: ceph-csi-test name: ceph-csi-test
@ -47,11 +47,11 @@ spec:
output: output:
to: to:
kind: DockerImage kind: DockerImage
name: registry-ceph-csi.apps.ocp.ci.centos.org/ceph-csi:test name: registry-ceph-csi.apps.ocp.cloud.ci.centos.org/ceph-csi:test
pushSecret: pushSecret:
name: container-registry-auth name: container-registry-auth
--- ---
apiVersion: v1 apiVersion: build.openshift.io/v1
kind: BuildConfig kind: BuildConfig
metadata: metadata:
name: ceph-csi-devel name: ceph-csi-devel
@ -73,6 +73,6 @@ spec:
output: output:
to: to:
kind: DockerImage kind: DockerImage
name: registry-ceph-csi.apps.ocp.ci.centos.org/ceph-csi:devel name: registry-ceph-csi.apps.ocp.cloud.ci.centos.org/ceph-csi:devel
pushSecret: pushSecret:
name: container-registry-auth name: container-registry-auth

View File

@ -21,7 +21,7 @@ stringData:
config.json: |- config.json: |-
{ {
"auths": { "auths": {
"registry-ceph-csi.apps.ocp.ci.centos.org": { "registry-ceph-csi.apps.ocp.cloud.ci.centos.org": {
"auth": "@@SOME_B64ENCODED_STRING@@" "auth": "@@SOME_B64ENCODED_STRING@@"
} }
} }
@ -61,7 +61,7 @@ spec:
volumes: volumes:
- name: container-images - name: container-images
persistentVolumeClaim: persistentVolumeClaim:
claimName: ceph-csi-image-registry claimName: image-registry
- name: htpasswd - name: htpasswd
secret: secret:
secretName: container-registry-auth secretName: container-registry-auth

View File

@ -10,7 +10,7 @@ def skip_e2e = 0
def doc_change = 0 def doc_change = 0
def k8s_release = 'latest' def k8s_release = 'latest'
def namespace = 'k8s-e2e-storage-' + UUID.randomUUID().toString().split('-')[-1] def namespace = 'k8s-e2e-storage-' + UUID.randomUUID().toString().split('-')[-1]
def ci_registry = 'registry-ceph-csi.apps.ocp.ci.centos.org' def ci_registry = 'registry-ceph-csi.apps.ocp.cloud.ci.centos.org'
def failure = null def failure = null
def ssh(cmd) { def ssh(cmd) {

View File

@ -9,7 +9,7 @@ def git_since = "devel"
def skip_e2e = 0 def skip_e2e = 0
def doc_change = 0 def doc_change = 0
def k8s_release = 'latest' def k8s_release = 'latest'
def ci_registry = 'registry-ceph-csi.apps.ocp.ci.centos.org' def ci_registry = 'registry-ceph-csi.apps.ocp.cloud.ci.centos.org'
def namespace = 'cephcsi-e2e-' + UUID.randomUUID().toString().split('-')[-1] def namespace = 'cephcsi-e2e-' + UUID.randomUUID().toString().split('-')[-1]
def failure = null def failure = null

View File

@ -9,7 +9,7 @@ def git_since = 'devel'
def skip_e2e = 0 def skip_e2e = 0
def doc_change = 0 def doc_change = 0
def k8s_release = 'latest' def k8s_release = 'latest'
def ci_registry = 'registry-ceph-csi.apps.ocp.ci.centos.org' def ci_registry = 'registry-ceph-csi.apps.ocp.cloud.ci.centos.org'
def failure = null def failure = null
def ssh(cmd) { def ssh(cmd) {

View File

@ -9,7 +9,7 @@
# registry. # registry.
# #
CI_REGISTRY='registry-ceph-csi.apps.ocp.ci.centos.org' CI_REGISTRY='registry-ceph-csi.apps.ocp.cloud.ci.centos.org'
# get_image_entries returns the contents of images.txt without comments or empty lines # get_image_entries returns the contents of images.txt without comments or empty lines
function get_image_entries() { function get_image_entries() {

View File

@ -9,7 +9,7 @@ def git_since = 'devel'
def skip_e2e = 0 def skip_e2e = 0
def doc_change = 0 def doc_change = 0
def k8s_release = 'latest' def k8s_release = 'latest'
def ci_registry = 'registry-ceph-csi.apps.ocp.ci.centos.org' def ci_registry = 'registry-ceph-csi.apps.ocp.cloud.ci.centos.org'
def failure = null def failure = null
def ssh(cmd) { def ssh(cmd) {