X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fengine%2Fonap-periodic-jobs%2Fonap-online-deploy-test-jobs.yaml;h=ae1a99c38d4be3d0c5bd762106f64ee516327858;hb=3cc9d6b23e820901a0dcb73b9ed9ddb13774c321;hp=059b20d5672c006cef7014cd5406e92eedeed08c;hpb=78eb490d2222a89621b924b2ab2f716f29f3dcd7;p=infra%2Fcicd.git 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 059b20d5..ae1a99c3 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: '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}'