engine: Move CI to City London Region

[infra/cicd.git] / jjb / engine / onap-periodic-jobs / onap-online-deploy-test-jobs.yaml

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 059b20d5672c006cef7014cd5406e92eedeed08c..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: 'city-jumphost-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:
@@ -82,8 +82,6 @@
       - healthcheck:
           build-timeout: 30
           test-type: onap-healthcheck
-      - promote:
-          build-timeout: 240
 
     jobs:
       - '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
@@ -349,31 +347,6 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-      - multijob:
-          name: Promote ONAP (not activated)
-          condition: ALWAYS
-          projects:
-            - name: 'onap-{onap-profile}-{environment-type}-promote-{distro}-{cloud}-{type}-{ci-loop}-{cloud}-{onap-branch}'
-              current-parameters: false
-              predefined-parameters: |
-                SLAVE_LABEL=$SLAVE_LABEL
-                DISTRO=$DISTRO
-                PROVISIONER_TYPE=$PROVISIONER_TYPE
-                INSTALLER_TYPE=$INSTALLER_TYPE
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                ONAP_VERSION=$ONAP_VERSION
-                ONAP_PROFILE=$ONAP_PROFILE
-                POD_NAME=$POD_NAME
-                EXECUTION_MODE=$EXECUTION_MODE
-                ENGINE_VERSION=$ENGINE_VERSION
-                ENGINE_REFSPEC=$ENGINE_REFSPEC
-                DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
-                DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
-                XTESTING_REPO_URL=$XTESTING_REPO_URL
-                ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: false
 
 - job-template:
     name: 'onap-{onap-profile}-{environment-type}-{job-phase}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'