X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=b967fc2d2f61e928790655dc42925b0ced3e974f;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=bdb313da0f571bf180bd94fc0d5a8851f83c1819;hpb=aadea7b744bfd18a2944ea079155f311edc58e39;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index bdb313da..b967fc2d 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -19,20 +19,8 @@
 # ============LICENSE_END=========================================================
 
 #--------------------------------------------------------------------------------------
-# The jobs declared in this JJB configuration file are used for verifying cloud-infra
-# engine from the tip of the master branch periodically to check the stability of it.
-#
-# These jobs are set to run on slaves with label vpod-deploy-ubuntu1604.
-# The slaves have
-#   - Ubuntu1604 as the base distro
-#   - nested virtualization
-#   - internet access
-#   - passwordless sudo
-#   - 16 CPUs/32GB RAM/200 GB Disk
-#   - docker, git vim curl wget zip unzip chrony apt-transport-https ca-certificates curl
-#     gnupg-agent software-properties-common docker-ce docker-ce-cli containerd.io openjdk-8-jre
-#
-# The slaves should not have a cloud infra scenario deployed on them.
+# The jobs declared in this JJB configuration file are used for deploying and testing
+# ONAP scenario onap-nofeature-noha.
 #--------------------------------------------------------------------------------------
 
 - project:
@@ -40,57 +28,98 @@
 
     project: 'infra/engine'
 
+    cloud:
+      - city:
+          slave-label: 'engine-jumphost-online-ubuntu1804'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
+          daily-trigger: '@midnight'
+      - xerces:
+          slave-label: 'xerces-jumphost-ubuntu1804'
+          openrc-credentials-file: 'est-estinfra-openrcfile-xerces-lund-onap'
+          daily-trigger: '#@midnight'
+
     onap-branch:
-      - 'dublin':
+      - 'elalto':
+          nordix-branch: master
+          onap-version: elalto
+          onap-flavor: full
+          engine-version: master
+          engine-refspec: master
+          deploy-scenario: 'onap-nofeature-noha'
+          deploy-scenario-version: master
+          deploy-scenario-refspec: master
+          disabled: true
+          delete-stack: 'yes'
+      - 'master':
           nordix-branch: master
-          onap-version: 4.0.0-ONAP
+          onap-version: master
           onap-flavor: full
           engine-version: master
           engine-refspec: master
+          deploy-scenario: 'onap-nofeature-noha'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
-          disabled: false
+          disabled: true
+          delete-stack: 'yes'
 
     distro:
-      - ubuntu1804:
-          disabled: 'false'
+      - ubuntu1804
 
-    deploy-scenario:
-      - onap-oom-nofeature:
-          installer-type: kubespray
+    ci-loop:
+      - daily
 
     type:
       - cloud:
+          pod-name: est-cloud
           provisioner-type: heat
-          slave-label: 'jumphost-onap-ubuntu1804'
+          installer-type: kubespray
 
-    phase:
+    onap-other-phases:
       - onap-deploy:
-          build-timeout: 150
-      - oom-healthcheck:
-          build-timeout: 30
-      - onap-healthcheck:
+          build-timeout: 210
+      - oom-hc:
           build-timeout: 30
+          test-type: oom-healthcheck
       - promote-onap:
-          build-timeout: 5
+          build-timeout: 240
+
+    onap-healthcheck-phases:
+      - onap-hc-core:
+          build-timeout: 30
+          test-type: onap-healthcheck
+      - onap-hc-small:
+          build-timeout: 30
+          test-type: onap-healthcheck
+      - onap-hc-medium:
+          build-timeout: 30
+          test-type: onap-healthcheck
+      - onap-hc-full:
+          build-timeout: 30
+          test-type: onap-healthcheck
+      - onap-hc-healthdist:
+          build-timeout: 30
+          test-type: onap-healthcheck
 
     jobs:
-      - '{deploy-scenario}-periodic-{distro}-{type}-{onap-branch}'
-      - '{phase}-periodic-{distro}-{type}-{onap-branch}'
+      - 'onap-online-{onap-flavor}-{distro}-{installer-type}-{cloud}-{type}-{ci-loop}-{onap-branch}'
+      - '{onap-other-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+      - '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{distro}-{type}-{onap-branch}'
+    name: 'onap-online-{onap-flavor}-{distro}-{installer-type}-{cloud}-{type}-{ci-loop}-{onap-branch}'
 
     project-type: multijob
 
     disabled: '{obj:disabled}'
 
-    concurrent: true
+    concurrent: false
 
     parameters:
       - project-parameters:
           project: '{project}'
           branch: '{nordix-branch}'
+      - nordix-gerrit-parameters
+      - onap-parameter-macro-legacy
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
@@ -100,25 +129,9 @@
           default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
-          name: PROVISIONER_TYPE
-          default: '{provisioner-type}'
-          description: 'Provisioner to use for provisioning nodes'
-      - string:
-          name: INSTALLER_TYPE
-          default: '{installer-type}'
-          description: 'Installer to use for deploying the scenario'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{deploy-scenario}'
-          description: 'Scenario to deploy and test'
-      - string:
-          name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-full.yaml"
-          description: 'Type of the deployment'
-      - string:
-          name: DEPLOY_TYPE
-          default: '{type}'
-          description: 'Type of the deployment'
+          name: OPENSTACK_CLOUD_PROVIDER
+          default: '{cloud}'
+          description: 'Name of the cloud where this job is run'
       - string:
           name: ONAP_VERSION
           default: '{onap-version}'
@@ -128,9 +141,15 @@
           default: '{onap-flavor}'
           description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.'
       - string:
-          name: ENGINE_REPO_URL
-          default: 'https://gerrit.nordix.org/infra/engine.git'
-          description: 'URL to Nordix cloud-infra/engine repository'
+          name: STACK_NAME
+          default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
+      - string:
+          name: KEYPAIR_NAME
+          default: 'keypair-nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
+      - string:
+          name: HEAT_ENVIRONMENT_FILENAME
+          default: "heat-environment-{cloud}-{distro}-full.yaml"
+          description: 'Type of the deployment'
       - string:
           name: ENGINE_VERSION
           default: '{engine-version}'
@@ -148,36 +167,46 @@
           default: '{deploy-scenario-refspec}'
           description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_VERSION and must be refspec.'
       - string:
-          name: XTESTING_REPO_URL
-          default: 'https://gerrit.nordix.org/opnfv/xtesting-onap.git'
-          description: 'URL to Nordix xtesting-onap repository'
-      - string:
-          name: ENGINE_ANSIBLE_PARAMS
-          default: ''
-          description: 'Extra parameters that can be added when run the play books.'
+          name: POD_NAME
+          default: '{pod-name}'
+          description: 'Development purposes only! Set to none for disabling test results DB reporting.'
       - string:
-          name: CLEANUP
-          default: 'true'
-          description: 'Cleanup leftovers of the previous run'
+          name: DELETE_STACK
+          default: '{delete-stack}'
+          description: 'Development purposes only! Whether delete the stack or not. It must either be yes or no. Setting this to no will increase the cost!'
 
     properties:
       - logrotate
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
             - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
-          max-total: 3
+          max-total: 1
           option: project
 
     wrappers:
+      - credentials-binding:
+          - file:
+              credential-id: '{openrc-credentials-file}'
+              variable: OPENRC_FILE
+      - mask-passwords
       - build-timeout:
-          timeout: 220
+          timeout: 630
       - fix-workspace-permissions
+      - openstack:
+          single-use: True
+
+    triggers:
+      - timed: '{daily-trigger}'
 
     scm:
       - git-scm:
@@ -189,111 +218,250 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE | $DEPLOY_SCENARIO
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
+      - shell: |
+          #!/bin/bash
+          /bin/rm -rf /tmp/openrc && /bin/cp -f $OPENRC_FILE /tmp/openrc
       - multijob:
-          name: Deploy ONAP
-          condition: SUCCESSFUL
+          name: Deploy ONAP using OOM
+          condition: ALWAYS
           projects:
-            - name: 'onap-deploy-periodic-{distro}-{type}-{onap-branch}'
-              current-parameters: true
+            - name: 'onap-deploy-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
+                OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=$ONAP_FLAVOR
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 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
-                CLEANUP=$CLEANUP
               git-revision: true
               node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
+              kill-phase-on: NEVER
+              abort-all-job: false
       - multijob:
-          name: OOM Healthcheck
-          condition: SUCCESSFUL
+          name: K8S and OOM Healthcheck using xtesting
+          condition: ALWAYS
           projects:
-            - name: 'oom-healthcheck-periodic-{distro}-{type}-{onap-branch}'
-              current-parameters: true
+            - name: 'oom-hc-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
+                OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 ONAP_VERSION=$ONAP_VERSION
-                ONAP_FLAVOR=$ONAP_FLAVOR
+                ONAP_FLAVOR=full
+                TEST_TYPE=oom-healthcheck
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 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
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
       - multijob:
-          name: ONAP Healthcheck
-          condition: SUCCESSFUL
+          name: ONAP Healthcheck using xtesting
+          execution-type: SEQUENTIALLY
+          condition: ALWAYS
           projects:
-            - name: 'onap-healthcheck-periodic-{distro}-{type}-{onap-branch}'
-              current-parameters: true
+            - name: 'onap-hc-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
               predefined-parameters: |
+                SLAVE_LABEL=$SLAVE_LABEL
                 DISTRO=$DISTRO
+                OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                INSTALLER_TYPE=$INSTALLER_TYPE
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                ONAP_VERSION=$ONAP_VERSION
+                ONAP_FLAVOR=core
+                TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
+                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
+            - name: 'onap-hc-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
+              predefined-parameters: |
+                SLAVE_LABEL=$SLAVE_LABEL
+                DISTRO=$DISTRO
+                OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
+                DEPLOY_TYPE=$DEPLOY_TYPE
                 ONAP_VERSION=$ONAP_VERSION
-                ONAP_FLAVOR=$ONAP_FLAVOR
+                ONAP_FLAVOR=small
+                TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 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
+            - name: 'onap-hc-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
+              predefined-parameters: |
+                SLAVE_LABEL=$SLAVE_LABEL
+                DISTRO=$DISTRO
+                OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                INSTALLER_TYPE=$INSTALLER_TYPE
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DEPLOY_TYPE=$DEPLOY_TYPE
+                ONAP_VERSION=$ONAP_VERSION
+                ONAP_FLAVOR=medium
+                TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
+                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
+            - name: 'onap-hc-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
+              predefined-parameters: |
+                SLAVE_LABEL=$SLAVE_LABEL
+                DISTRO=$DISTRO
+                OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                INSTALLER_TYPE=$INSTALLER_TYPE
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DEPLOY_TYPE=$DEPLOY_TYPE
+                ONAP_VERSION=$ONAP_VERSION
+                ONAP_FLAVOR=full
+                TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
+                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
+            - name: 'onap-hc-healthdist-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
+              predefined-parameters: |
+                SLAVE_LABEL=$SLAVE_LABEL
+                DISTRO=$DISTRO
+                OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                INSTALLER_TYPE=$INSTALLER_TYPE
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DEPLOY_TYPE=$DEPLOY_TYPE
+                ONAP_VERSION=$ONAP_VERSION
+                ONAP_FLAVOR=healthdist
+                TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
+                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
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
       - multijob:
-          name: Promote ONAP
-          condition: SUCCESSFUL
+          name: Promote ONAP (not activated)
+          condition: ALWAYS
           projects:
-            - name: 'promote-onap-periodic-{distro}-{type}-{onap-branch}'
-              current-parameters: true
+            - name: 'promote-onap-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
               predefined-parameters: |
+                SLAVE_LABEL=$SLAVE_LABEL
                 DISTRO=$DISTRO
+                OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=$ONAP_FLAVOR
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
                 ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
 
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - ABORTED
+                - NOT_BUILT
+                - UNSTABLE
+              build-steps:
+                - shell:
+                    !include-raw-escape: ./wait-for-pkg-manager.sh
+                - shell:
+                    !include-raw: ./delete-heat-stack.sh
+
 - job-template:
-    name: '{phase}-periodic-{distro}-{type}-{onap-branch}'
+    name: '{onap-other-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
 
     disabled: false
 
@@ -306,71 +474,128 @@
       - project-parameters:
           project: '{project}'
           branch: '{nordix-branch}'
+      - nordix-gerrit-parameters
+      - onap-parameter-macro-legacy
       - label:
           name: SLAVE_LABEL
-          default: 'jumphost-onap-ubuntu1804'
+          default: 'xerces-jumphost-onap-ubuntu1804'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
+      - string:
+          name: OPENSTACK_CLOUD_PROVIDER
+          default: 'city'
+          description: 'Name of the cloud where this job is run'
       - string:
           name: DISTRO
           default: 'ubuntu1804'
-          description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
-          name: PROVISIONER_TYPE
-          default: 'heat'
-          description: 'Provisioner to use for provisioning nodes'
+          name: ONAP_FLAVOR
+          default: '{onap-flavor}'
+          description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.'
       - string:
-          name: INSTALLER_TYPE
-          default: 'kubespray'
-          description: 'Installer to use for deploying the scenario'
+          name: ONAP_VERSION
+          default: '{onap-version}'
+          description: 'ONAP version to deploy'
       - string:
-          name: DEPLOY_SCENARIO
-          default: 'onap-oom-nofeature'
-          description: 'Scenario to deploy and test'
+          name: HEAT_ENVIRONMENT_FILENAME
+          default: "heat-environment-full.yaml"
+          description: 'Type of the deployment'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-full.yaml"
+          default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
           description: 'Type of the deployment'
+
+    wrappers:
+      - mask-passwords
+      - build-timeout:
+          timeout: '{build-timeout}'
+      - fix-workspace-permissions
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: 'nordix-cicd-arm-credentials'
+              username: NORDIX_ARM_USERNAME
+              password: NORDIX_ARM_TOKEN
+          - username-password-separated:
+              credential-id: 'nordix-cicd-harbor-credentials'
+              username: NORDIX_HARBOR_USERNAME
+              password: NORDIX_HARBOR_PASSWORD
+
+    scm:
+      - git-scm:
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+          branch: '{nordix-branch}'
+          refspec: ''
+          wipe_workspace: true
+          clean_before: false
+
+    builders:
+      - description-setter:
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER
+      - '{onap-other-phases}-macro-legacy'
+
+- job-template:
+    name: '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+
+    disabled: false
+
+    concurrent: true
+
+    properties:
+      - logrotate
+
+    parameters:
+      - project-parameters:
+          project: '{project}'
+          branch: '{nordix-branch}'
+      - nordix-gerrit-parameters
+      - onap-parameter-macro-legacy
+      - label:
+          name: SLAVE_LABEL
+          default: 'xerces-jumphost-onap-ubuntu1804'
+          description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
+      - string:
+          name: OPENSTACK_CLOUD_PROVIDER
+          default: 'city'
+          description: 'Name of the cloud where this job is run'
       - string:
-          name: DEPLOY_TYPE
-          default: 'cloud'
-          description: 'Type of the deployment. Overriden by upstream job.'
+          name: DISTRO
+          default: 'ubuntu1804'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: ONAP_VERSION
-          default: 'master'
+          default: '{onap-version}'
           description: 'ONAP version to deploy'
       - string:
-          name: ONAP_FLAVOR
-          default: '{onap-flavor}'
-          description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.'
+          name: HEAT_ENVIRONMENT_FILENAME
+          default: "heat-environment-full.yaml"
+          description: 'Type of the deployment'
+      - string:
+          name: HEAT_ENVIRONMENT_FILE
+          default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
+          description: 'Type of the deployment'
       - string:
           name: ENGINE_VERSION
-          default: 'master'
+          default: '{engine-version}'
           description: 'Development purposes only! Nordix Cloud Infra Engine version to use for deploying ONAP. Could be sha, branch'
       - string:
           name: ENGINE_REFSPEC
-          default: 'master'
+          default: '{engine-refspec}'
           description: 'Development purposes only! Nordix Cloud Infra Engine version to use for deploying ONAP. Must be refspec.'
       - string:
           name: DEPLOY_SCENARIO_VERSION
-          default: 'master'
+          default: '{deploy-scenario-version}'
           description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_REFSPEC and could be sha, branch.'
       - string:
           name: DEPLOY_SCENARIO_REFSPEC
-          default: 'master'
+          default: '{deploy-scenario-refspec}'
           description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_VERSION and must be refspec.'
       - string:
-          name: XTESTING_REPO_URL
-          default: 'https://gerrit.nordix.org/opnfv/xtesting-onap.git'
-          description: 'URL to Nordix xtesting-onap repository'
-      - string:
-          name: ENGINE_ANSIBLE_PARAMS
-          default: ''
-          description: 'Extra parameters that can be added when run the play books.'
-      - string:
-          name: CLEANUP
-          default: 'true'
+          name: POD_NAME
+          default: '{pod-name}'
+          description: 'Development purposes only! Set to none for disabling test results DB reporting.'
 
     wrappers:
+      - mask-passwords
       - build-timeout:
           timeout: '{build-timeout}'
       - fix-workspace-permissions
@@ -385,7 +610,7 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE - $DEPLOY_SCENARIO
-      - '{phase}-macro'
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER
+      - 'onap-healthcheck-macro-legacy'
 
 # vim: set ts=2 sw=2 expandtab: