onap: Create periodic jobs to run on Xerces cloud

This change creates 2 new jobs to run on Xerces cloud and also
changes how the parent/upstream jobs are named. Since clouds name
images, flavors, and public networks differently, the jobs use
corresponding heat environment files based on cloud and distro
names in order to be able to create stacks with the right parameters.

Currently only City jobs are automatically triggered and Xerces
jobs require to be triggered manually.

Please note that once this change gets merged, existing parent/upstream
jobs will be removed and new ones will be created with the new name.

Also oom-hc job was not running for a month due to a bug which is
fixed as well.

Change-Id: I063ea2de482aeb293409fb27e0927d6397ffbd98

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 69e33a80e5e00920af31a3bfb1245a5c165f95ca..68c5c5b5547bfea09bd5a5771a2994429e091a17 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -28,6 +28,16 @@
 
     project: 'infra/engine'
 
+    cloud:
+      - city:
+          slave-label: 'city-jumphost-onap-ubuntu1804'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
+          daily-trigger: '@midnight'
+      - xerces:
+          slave-label: 'xerces-jumphost-onap-ubuntu1804'
+          openrc-credentials-file: 'est-estinfra-openrcfile-xerces-lund-onap'
+          daily-trigger: '#@midnight'
+
     onap-branch:
       - 'dublin':
           nordix-branch: master
@@ -35,6 +45,7 @@
           onap-flavor: full
           engine-version: master
           engine-refspec: master
+          deploy-scenario: 'onap-nofeature-noha'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           disabled: false
@@ -45,6 +56,7 @@
           onap-flavor: full
           engine-version: master
           engine-refspec: master
+          deploy-scenario: 'onap-nofeature-noha'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           disabled: false
@@ -53,9 +65,6 @@
     distro:
       - ubuntu1804
 
-    deploy-scenario:
-      - onap-nofeature-noha
-
     ci-loop:
       - daily
 
@@ -64,12 +73,11 @@
           pod-name: est-cloud
           provisioner-type: heat
           installer-type: kubespray
-          slave-label: 'jumphost-onap-ubuntu1804'
 
     onap-other-phases:
       - onap-deploy:
           build-timeout: 210
-      - oom-healthcheck:
+      - oom-hc:
           build-timeout: 30
           test-type: oom-healthcheck
       - promote-onap:
@@ -93,12 +101,12 @@
           test-type: onap-healthcheck
 
     jobs:
-      - '{deploy-scenario}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{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}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+    name: 'onap-online-{onap-flavor}-{distro}-{installer-type}-{cloud}-{type}-{ci-loop}-{onap-branch}'
 
     project-type: multijob
 
@@ -123,6 +131,10 @@
       - string:
           name: STACK_NAME
           default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
+      - string:
+          name: HEAT_ENVIRONMENT_FILE
+          default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-{cloud}-{distro}-full.yaml"
+          description: 'Type of the deployment'
       - string:
           name: ENGINE_VERSION
           default: '{engine-version}'
@@ -165,7 +177,7 @@
     wrappers:
       - credentials-binding:
           - file:
-              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+              credential-id: '{openrc-credentials-file}'
               variable: OPENRC_FILE
       - mask-passwords
       - build-timeout:
@@ -175,7 +187,7 @@
           single-use: True
 
     triggers:
-      - timed: '@midnight'
+      - timed: '{daily-trigger}'
 
     scm:
       - git-scm:
@@ -207,6 +219,7 @@
                 ONAP_FLAVOR=$ONAP_FLAVOR
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
@@ -235,6 +248,7 @@
                 TEST_TYPE=oom-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
@@ -264,6 +278,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
@@ -288,6 +303,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
@@ -312,6 +328,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
@@ -336,6 +353,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
@@ -360,6 +378,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
@@ -387,6 +406,7 @@
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
                 XTESTING_REPO_URL=$XTESTING_REPO_URL
@@ -436,6 +456,10 @@
           name: ONAP_VERSION
           default: '{onap-version}'
           description: 'ONAP version to deploy'
+      - 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'
 
     wrappers:
       - credentials-binding:
@@ -480,6 +504,10 @@
           name: ONAP_VERSION
           default: '{onap-version}'
           description: 'ONAP version to deploy'
+      - 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: ENGINE_VERSION
           default: '{engine-version}'

diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml
index b05c4e3ad8c62688e727ab4757fa4268864daa48..192321208d6de00c82ffc628d17f608e2d501170 100644 (file)
--- a/jjb/cloud-infra/onap-macros.yaml
+++ b/jjb/cloud-infra/onap-macros.yaml
@@ -46,10 +46,6 @@
           name: DEPLOY_TYPE
           default: 'cloud'
           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"
-          description: 'Type of the deployment'
       - string:
           name: TEST_TYPE
           default: 'oom-healthcheck'
@@ -75,7 +71,7 @@
           !include-raw: ./onap-deploy.sh
 
 - builder:
-    name: 'oom-healthcheck-macro'
+    name: 'oom-hc-macro'
     builders:
       - shell:
           !include-raw: ./oom-healthcheck.sh