engine: Adapt testing to stack oriented framework

Change-Id: I28fdaec0f103651cfc6361aba09639c55aa4aa2a

diff --git a/jjb/engine/scripts/deploy.sh b/jjb/engine/scripts/deploy.sh
index d52bbfa5d8c748613be62577fa0f11acd679ad11..abd2414742b2fef1d4ee96e3919696573355576b 100755 (executable)
--- a/jjb/engine/scripts/deploy.sh
+++ b/jjb/engine/scripts/deploy.sh
@@ -44,6 +44,10 @@ HEAT_ENVIRONMENT_FILENAME=${HEAT_ENVIRONMENT_FILENAME:-/tmp/heat}
 /bin/cp -f $OPENRC_FILE /tmp/openrc
 
 cd "$ENGINE_ROOT_DIR/engine"
-./deploy.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -p "$PDF" -i "$IDF" -o /tmp/openrc -d "$DISTRO" -v
+./deploy.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -c "$DEPLOY_SCENARIO" -p "$PDF" -i "$IDF" -o /tmp/openrc -d "$DISTRO" -v
+
+# NOTE (fdegir): we need inventory.ini for test execution
+/bin/rm -f /tmp/inventory.ini
+/bin/cp -f /opt/engine/.cache/config/inventory.ini /tmp/inventory.ini
 
 # vim: set ts=2 sw=2 expandtab:

diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh
index 14a2b0cb7d94537e721c1136fa3bddc368466081..6438dda762986e33206384c1ac9687c62b0d5f15 100755 (executable)
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -42,7 +42,11 @@ echo "Info  : Cloning infra/test repository"
 cd $HOME && /bin/rm -rf $WORKSPACE
 git clone -q $TEST_REPO_URL $WORKSPACE
 
+# NOTE (fdegir): we need to override execution mode variable coming from change.properties file
+export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
+
 cd $WORKSPACE/test
-./test.sh -f $TEST_FW -t $TEST_SUITE -s $STACK_TYPE -y $YARDSTICK_DISPATCHER -d
+./test.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -c "$DEPLOY_SCENARIO" -f "$TEST_FW" -t "$TEST_SUITE" \
+    -o /tmp/openrc -i /tmp/inventory.ini -y "$YARDSTICK_DISPATCHER" -v
 
 # vim: set ts=2 sw=2 expandtab:

diff --git a/jjb/engine/scripts/generate-change-metadata.sh b/jjb/engine/scripts/generate-change-metadata.sh
index 2ad1e5fece6a4c3c07ecbefb0cb953aebdf8c986..84b71467b17c9b25b4b9fc4cf8ab49e8ca390949 100755 (executable)
--- a/jjb/engine/scripts/generate-change-metadata.sh
+++ b/jjb/engine/scripts/generate-change-metadata.sh
@@ -49,13 +49,33 @@ if [[ "$GERRIT_PROJECT" =~ /stack/ ]]; then
   export STACK_VERSION="$GERRIT_PATCHSET_REVISION"
   export STACK_REFSPEC="$GERRIT_REFSPEC"
 
+  case "${STACK_TYPE}" in
+    openstack)
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
+      ;;
+    kubernetes)
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
+      ;;
+    onap)
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
+      ;;
+    ironic)
+      export DEPLOY_SCENARIO="ubuntu1804"
+      ;;
+    *) echo "ERROR : Invalid stack $ENGINE_COMPONENT"; exit 1;;
+  esac
+
+  export STACK_VERSION="$GERRIT_BRANCH"
+
   # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
+  echo "        DEPLOY_SCENARIO=$DEPLOY_SCENARIO"
   echo "        STACK_VERSION=$GERRIT_PATCHSET_REVISION"
   echo "        STACK_REFSPEC=$GERRIT_REFSPEC"
 
   # record vars to properties file
   echo "STACK_TYPE=$STACK_TYPE" >> "$CHANGE_METADATA_FILE"
+  echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" >> "$CHANGE_METADATA_FILE"
   echo "STACK_VERSION=$STACK_VERSION" >> "$CHANGE_METADATA_FILE"
   echo "STACK_REFSPEC=$STACK_REFSPEC" >> "$CHANGE_METADATA_FILE"
 elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then
@@ -63,12 +83,15 @@ elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then
   case "${ENGINE_COMPONENT}" in
     kolla)
       export STACK_TYPE="openstack"
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
       ;;
     kubespray)
       export STACK_TYPE="kubernetes"
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
       ;;
     oom)
       export STACK_TYPE="onap"
+      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
       ;;
     *) echo "ERROR : Invalid engine component $ENGINE_COMPONENT"; exit 1;;
   esac
@@ -76,12 +99,14 @@ elif [[ "$GERRIT_PROJECT" =~ /installer/ ]]; then
 
   # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
+  echo "        DEPLOY_SCENARIO=$DEPLOY_SCENARIO"
   echo "        STACK_VERSION=$STACK_VERSION"
   echo "        NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION"
   echo "        NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC"
 
   # record vars to properties file
   echo "STACK_TYPE=$STACK_TYPE" >> "$CHANGE_METADATA_FILE"
+  echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" >> "$CHANGE_METADATA_FILE"
   echo "STACK_VERSION=$STACK_VERSION" >> "$CHANGE_METADATA_FILE"
   echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION" >> "$CHANGE_METADATA_FILE"
   echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC" >> "$CHANGE_METADATA_FILE"
@@ -92,12 +117,14 @@ else
 
   # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
+  echo "        DEPLOY_SCENARIO=$DEPLOY_SCENARIO"
   echo "        STACK_VERSION=$STACK_VERSION"
   echo "        NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION"
   echo "        NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC"
 
   # record vars to properties file
-  echo "STACK_TYPE=kubernetes" >> "$CHANGE_METADATA_FILE"
+  echo "STACK_TYPE=$STACK_TYPE" >> "$CHANGE_METADATA_FILE"
+  echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" >> "$CHANGE_METADATA_FILE"
   echo "STACK_VERSION=$STACK_VERSION" >> "$CHANGE_METADATA_FILE"
   echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_VERSION=$GERRIT_PATCHSET_REVISION" >> "$CHANGE_METADATA_FILE"
   echo "NORDIX_$(echo $ENGINE_COMPONENT | tr a-z A-Z)_REFSPEC=$GERRIT_REFSPEC" >> "$CHANGE_METADATA_FILE"

diff --git a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
index b00de3fadbf8c957aeefd7fe0b0374eabe2225cc..7834f1b09b99b94a12ad9ca317c9bb30ca158fea 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@ -25,6 +25,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          deploy-scenario: 'k8-multus-plugins'
 
     environment-type:
       - online:
@@ -84,6 +85,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: DISTRO
           default: '{distro}'

diff --git a/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml b/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
index 2ac1df64c682fd35777176c4ea5501cda33f8610..2ae78fe020cbdadca40cc9d29f6c49f8aab684ec 100644 (file)
--- a/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
@@ -25,6 +25,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          deploy-scenario: 'k8-multus-plugins'
 
     environment-type:
       - online:
@@ -77,6 +78,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with. This depends on the branch of the stack'
       - string:
           name: DISTRO
           default: '{distro}'

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
index 45e5f413311a639a38f888d1a92929e9cbe93f81..4093ba5b9e1bbbeae8e357e243f981dc883e62d5 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@ -28,10 +28,13 @@
     stream:
       - 'master':
           branch: 'master'
+          deploy-scenario: 'k8-multus-plugins'
       - '1_17':
           branch: '1.17'
+          deploy-scenario: 'k8-multus-plugins'
       - '1_15':
           branch: '1.15'
+          deploy-scenario: 'k8-calico-nofeature'
 
     environment-type:
       - online:
@@ -91,6 +94,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with. This depends on the branch of the stack'
       - string:
           name: DISTRO
           default: '{distro}'

diff --git a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
index b2726ca5a31a597e6bdfb0e242cde162cfad75c2..cf3a3db02683813f055f9eb17c30e623201afe5e 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
@@ -25,10 +25,13 @@
     stream:
       - 'master':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
       - 'frankfurt':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
       - 'elalto':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
 
     environment-type:
       - online:
@@ -82,6 +85,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: DISTRO
           default: '{distro}'

diff --git a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
index d492e5786dbe2012cf1f28ffdf1783885ebc053b..5125be3d7e5439f5c8b6169e13361d6ee2c03f21 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
@@ -25,10 +25,13 @@
     stream:
       - 'master':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
       - 'train':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
       - 'stein':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
 
     environment-type:
       - online:
@@ -82,6 +85,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: DISTRO
           default: '{distro}'