Set default organization to 'quay.io/eclipse' instead of 'eclipse' (#…

…15768) * Set default organization to 'quay.io/eclipse' instead of 'eclipse' Signed-off-by: Vitalii Parfonov <vparfono@redhat.com> * Fix image name in Happy path tests Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Fix che-server image address in tests Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> Co-authored-by: Dmytro Nochevnov <dnochevn@redhat.com>
eclipse-che · Jan 22, 2020 · 28b42e3 · 28b42e3
1 parent dc2f3b5
commit 28b42e3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/dockerfiles/build.include b/dockerfiles/build.include
@@ -39,7 +39,7 @@ init() {
   BOLD='\033[1m'
   UNDERLINE='\033[4m'
 
-  ORGANIZATION="eclipse"
+  ORGANIZATION="quay.io/eclipse"
   PREFIX="che"
   TAG="nightly"
   SKIP_TESTS=false

diff --git a/tests/.infra/crw-ci/nightly/k8s/Jenkinsfile b/tests/.infra/crw-ci/nightly/k8s/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
                         build job: 'basic-MultiUser-Che-check-e2e-tests-against-k8s',
                                 parameters: [
                                         string(name: 'cheImageRepo',
-                                                value: 'eclipse/che-server'),
+                                                value: 'quay.io/eclipse/che-server'),
 
                                         string(name: 'cheImageTag',
                                                 value: 'nightly'),
@@ -58,7 +58,7 @@ pipeline {
                         build job: 'basic-MultiUser-Che-check-e2e-tests-against-k8s',
                                 parameters: [
                                         string(name: 'cheImageRepo',
-                                                value: 'eclipse/che-server'),
+                                                value: 'quay.io/eclipse/che-server'),
 
                                         string(name: 'cheImageTag',
                                                 value: 'nightly'),

diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile
@@ -171,8 +171,8 @@ pipeline {
             steps {
                 withCredentials([string(credentialsId: 'ed71c034-60bc-4fb1-bfdf-9570209076b5', variable: 'maxura_docker_password')]) {
                     sh """
-                        ${WORKSPACE}/dockerfiles/che/build.sh --dockerfile:Dockerfile
-                        docker tag eclipse/che-server:nightly docker.io/${cheImageRepo}:${mutableCheImageTag}
+                        ${WORKSPACE}/dockerfiles/che/build.sh --organization:eclipseche --tag:${mutableCheImageTag} --dockerfile:Dockerfile
+                        docker tag eclipseche/che-server:${mutableCheImageTag} docker.io/${cheImageRepo}:${mutableCheImageTag}
                         docker login -u maxura -p ${maxura_docker_password}
                         docker push docker.io/${cheImageRepo}:${mutableCheImageTag}
                     """

diff --git a/tests/.infra/crw-ci/pre-release-testing/k8s/Jenkinsfile b/tests/.infra/crw-ci/pre-release-testing/k8s/Jenkinsfile
@@ -92,7 +92,7 @@ pipeline {
                             build job: 'basic-MultiUser-Che-check-e2e-tests-against-k8s',
                                     parameters: [
                                             string(name: 'cheImageRepo',
-                                                    value: 'eclipse/che-server'),
+                                                    value: 'quay.io/eclipse/che-server'),
 
                                             string(name: 'cheImageTag',
                                                     value: 'rc'),
@@ -128,7 +128,7 @@ pipeline {
                             build job: 'basic-MultiUser-Che-check-e2e-tests-against-k8s',
                                     parameters: [
                                             string(name: 'cheImageRepo',
-                                                    value: 'eclipse/che-server'),
+                                                    value: 'quay.io/eclipse/che-server'),
 
                                             string(name: 'cheImageTag',
                                                     value: 'rc'),

diff --git a/...legacy-e2e/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml b/...legacy-e2e/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml
@@ -49,7 +49,7 @@ spec:
             - name: CHE_CONF
               value: /home/user/che-conf
             - name: CHE_IMAGE_REPO
-              value: eclipse/che-server
+              value: quay.io/eclipse/che-server
             - name: CHE_IMAGE_TAG
               value: nightly
             - name: CHE_INFRASTRUCTURE
@@ -133,7 +133,7 @@ spec:
                   optional: true
             - name: CHE_WORKSPACE_PLUGIN__REGISTRY__URL
               value: 'NULL'
-          image: 'eclipse/che-server:latest'
+          image: 'quay.io/eclipse/che-server:latest'
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3