X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fonap-periodic-jobs%2Fonap-online-deploy-test-jobs.yaml;h=ae1a99c38d4be3d0c5bd762106f64ee516327858;hb=3cc9d6b23e820901a0dcb73b9ed9ddb13774c321;hp=e6514e6cd7c673167c0b775a8ac23dfcbd7bbf18;hpb=e721b2f82a32634f58729246ea30e0085af3a2f9;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 e6514e6c..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:
@@ -76,21 +76,19 @@
     job-phase:
       - deploy:
           build-timeout: 420
-      - oom-hc:
+      - oom-healthcheck:
           build-timeout: 30
           test-type: oom-healthcheck
-      - hc:
+      - healthcheck:
           build-timeout: 30
           test-type: onap-healthcheck
-      - promote:
-          build-timeout: 240
 
     jobs:
-      - '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
-      - 'onap-{onap-profile}-{job-phase}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+      - '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
+      - 'onap-{onap-profile}-{environment-type}-{job-phase}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
 
 - job-template:
-    name: '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+    name: '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
 
     project-type: multijob
 
@@ -238,7 +236,7 @@
           name: Deploy ONAP using OOM (not activated)
           condition: ALWAYS
           projects:
-            - name: 'onap-{environment-type}-deploy-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-deploy-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -267,7 +265,7 @@
           name: K8S and OOM Healthcheck using xtesting (not activated)
           condition: ALWAYS
           projects:
-            - name: 'onap-{onap-profile}-oom-hc-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-oom-healthcheck-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -297,7 +295,7 @@
           execution-type: SEQUENTIALLY
           condition: ALWAYS
           projects:
-            - name: 'onap-{onap-profile}-hc-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-healthcheck-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -323,7 +321,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'onap-{environment-type}-{onap-profile}-healthdist-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-healthdist-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -349,34 +347,9 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-      - multijob:
-          name: Promote ONAP (not activated)
-          condition: ALWAYS
-          projects:
-            - name: 'onap-{onap-profile}-promote-{environment-type}-{distro}-{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}-{job-phase}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+    name: 'onap-{onap-profile}-{environment-type}-{job-phase}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
 
     disabled: false