From 26d913bb9246e02040ba09f2fd0376eb2bb7f493 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 7 May 2020 17:09:42 +0000 Subject: [PATCH] engine: Move CI to City Frankfurt Region Change-Id: I0ed116e6f9e64b1b8c2596e690edaef7c10df789 --- jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml | 4 ++-- jjb/engine/engine-verify-jobs/engine-verify-package.yaml | 4 ++-- .../kubernetes-offline-release-jobs.yaml | 4 ++-- .../onap-periodic-jobs/onap-online-deploy-test-jobs.yaml | 4 ++-- jjb/engine/onap-periodic-jobs/onap-online-release-jobs.yaml | 4 ++-- jjb/engine/onap-periodic-jobs/onap-parameter-macros.yaml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) 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 ad852147e..b96fec875 100644 --- 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-london-cicd' + openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-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}-lon' + default: 'engine-{slave-type}-{environment-type}-{distro}-fra' 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 d8e51af89..94fec2cbc 100644 --- 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-london-cicd' + openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-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}-lon' + default: 'engine-package-{distro}-fra' 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 b0a62fc6c..0bfd4fb96 100644 --- 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-london-cicd' + openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd' jobs: - 'kubernetes-periodic-release-{environment-type}-{distro}' @@ -99,7 +99,7 @@ description: 'CI loop type' - label: name: SLAVE_LABEL - default: 'engine-package-ubuntu1804-lon' + default: 'engine-package-ubuntu1804-fra' 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 ae1a99c38..d031d4c75 100644 --- 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-lon' - openrc-credentials-file: 'est-jenkins-openrcfile-city-london-cicd' + slave-label: 'engine-jumphost-online-ubuntu1804-fra' + openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-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 9ee7522c7..ae54cb8ec 100644 --- 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-london-cicd' + openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-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-lon' + default: 'engine-package-ubuntu1804-fra' 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 d16c3b82d..30f1fd437 100644 --- 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-lon' + default: 'engine-jumphost-online-ubuntu1804-fra' description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' - string: name: PROVISIONER_TYPE -- 2.25.1