engine: Move CI to City London Region

Change-Id: Ie1accf95abefe1876f40defc36373388b304e90c

diff --git a/jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml
index 5894086f4b4442cae8953eff6fefa23ae38f1c91..ad852147e3ae19cda78c5b515e5e64da0e564b9d 100644 (file)
--- a/jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml
@@ -65,7 +65,7 @@
 
     cloud:
       - city:
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-cicd'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-london-cicd'
 
     dependency-jobs: 'engine-verify-package-{distro}-{stream}'
     dependency-job-var: 'TRIGGER_engine_verify_package_{distro}_{stream}_BUILD_RESULT'
@@ -86,7 +86,7 @@
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'engine-{slave-type}-{environment-type}-{distro}'
+          default: 'engine-{slave-type}-{environment-type}-{distro}-lon'
           description: 'Slave label to schedule this job on.'
       - string:
           name: ENGINE_REPO_URL

diff --git a/jjb/engine/engine-verify-jobs/engine-verify-package.yaml b/jjb/engine/engine-verify-jobs/engine-verify-package.yaml
index bfb83bf5b910dc1e1e73399f68601406068462a5..d8e51af89d03d9e784665079cab0bda5cebd3514 100644 (file)
--- a/jjb/engine/engine-verify-jobs/engine-verify-package.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-package.yaml
@@ -25,7 +25,7 @@
     stream:
       - 'master':
           branch: '{stream}'
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-cicd'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-london-cicd'
           execution-mode: 'packaging'
           gated-projects: 'infra/engine|infra/provisioner/bifrost|infra/provisioner/heat|infra/installer/kolla|infra/installer/kubespray'
           successful: false
@@ -92,7 +92,7 @@
           description: 'CI loop type'
       - label:
           name: SLAVE_LABEL
-          default: 'engine-package-{distro}'
+          default: 'engine-package-{distro}-lon'
           description: 'Slave label to schedule this job on.'
       - project-parameters:
           project: $GERRIT_PROJECT

diff --git a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
index a9de132f25f10e82efb836d949df4672d6965108..b0a62fc6cb89846a0e2ff33ab28c76fd3b410bd4 100644 (file)
--- a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
+++ b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
@@ -36,7 +36,7 @@
 
     cloud:
       - city:
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-london-cicd'
 
     jobs:
       - 'kubernetes-periodic-release-{environment-type}-{distro}'
@@ -99,7 +99,7 @@
           description: 'CI loop type'
       - label:
           name: SLAVE_LABEL
-          default: 'engine-package-ubuntu1804'
+          default: 'engine-package-ubuntu1804-lon'
           description: 'Slave label to schedule this job on.'
 
     properties:

diff --git a/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml b/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml
index 2448092db45504cecf07f236199b4a601fd07942..ae1a99c38d4be3d0c5bd762106f64ee516327858 100644 (file)
--- a/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml
+++ b/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml
@@ -66,8 +66,8 @@
 
     cloud:
       - city:
-          slave-label: 'engine-jumphost-online-ubuntu1804'
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
+          slave-label: 'engine-jumphost-online-ubuntu1804-lon'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-london-cicd'
           daily-trigger: '@midnight'
 
     ci-loop:

diff --git a/jjb/engine/onap-periodic-jobs/onap-online-release-jobs.yaml b/jjb/engine/onap-periodic-jobs/onap-online-release-jobs.yaml
index 41ed4019d35b1ed0104fa1372e758d0ff886986a..9ee7522c72dbc2d5b1476b60106674eaa996f9f2 100644 (file)
--- a/jjb/engine/onap-periodic-jobs/onap-online-release-jobs.yaml
+++ b/jjb/engine/onap-periodic-jobs/onap-online-release-jobs.yaml
@@ -46,7 +46,7 @@
 
     cloud:
       - city:
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-london-cicd'
 
     jobs:
       - 'onap-{onap-profile}-periodic-release-{environment-type}-{distro}-{onap-branch}'
@@ -113,7 +113,7 @@
           description: 'CI loop type'
       - label:
           name: SLAVE_LABEL
-          default: 'engine-package-ubuntu1804'
+          default: 'engine-package-ubuntu1804-lon'
           description: 'Slave label to schedule this job on.'
 
     properties:

diff --git a/jjb/engine/onap-periodic-jobs/onap-parameter-macros.yaml b/jjb/engine/onap-periodic-jobs/onap-parameter-macros.yaml
index 837a27a004219b6343a685bb0418e403a63e6c0b..d16c3b82d17fe29b21828e86971dd8ca17c3f520 100644 (file)
--- a/jjb/engine/onap-periodic-jobs/onap-parameter-macros.yaml
+++ b/jjb/engine/onap-periodic-jobs/onap-parameter-macros.yaml
@@ -28,7 +28,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'engine-jumphost-online-ubuntu1804'
+          default: 'engine-jumphost-online-ubuntu1804-lon'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: PROVISIONER_TYPE