Adapt test jobs to stack oriented framework
Change-Id: If7ac1c111918b28a6f6d16b3108ce75b0e8f9b11
diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh
index 2257c01..68e8d03 100755
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -24,7 +24,7 @@
if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
# ensure we delete leftovers due to lack of disk space
sudo /bin/rm -rf /tmp/$INSTALLER_FILE ~/.ara \
- /opt/engine /opt/test /opt/stack /httpboot > /dev/null 2>&1 || true
+ /opt/test /opt/stack /httpboot > /dev/null 2>&1 || true
sudo docker ps -a --format {{.ID}} | xargs -n 1 sudo docker stop > /dev/null 2>&1 || true
sudo docker ps -a --format {{.ID}} | xargs -n 1 sudo docker rm > /dev/null 2>&1 || true
sudo docker images -a --format {{.ID}} | xargs -n 1 sudo docker rmi -f > /dev/null 2>&1 || true
diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh
index b43628f..14a2b0c 100755
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -32,14 +32,8 @@
exit 0
fi
-if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then
- echo "Info : Setting installer to kolla and scenario to os-nosdn-nofeature"
- export INSTALLER_TYPE="kolla"
- export DEPLOY_SCENARIO="os-nosdn-nofeature"
-fi
-
# NOTE (fdegir): delete unnecessary stuff to free up space on baremetal jumphost
-sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD ~/.ara \
+sudo /bin/rm -rf /tmp/$BUILD_ARTIFACTS ~/.ara \
/opt/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/dib \
/tmp/kubespray_cache > /dev/null 2>&1 || true
sudo docker images -a --format {{.ID}} | xargs -n 1 sudo docker rmi -f > /dev/null 2>&1 || true
@@ -49,4 +43,6 @@
git clone -q $TEST_REPO_URL $WORKSPACE
cd $WORKSPACE/test
-./test.sh -f $TEST_FW -t $TEST_SUITE -i $INSTALLER_TYPE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER
+./test.sh -f $TEST_FW -t $TEST_SUITE -s $STACK_TYPE -y $YARDSTICK_DISPATCHER -d
+
+# 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 f02b348..6800422 100755
--- a/jjb/engine/scripts/generate-change-metadata.sh
+++ b/jjb/engine/scripts/generate-change-metadata.sh
@@ -87,6 +87,7 @@
export STACK_TYPE=kubernetes
export STACK_VERSION=$STACK_VERSION
echo "STACK_TYPE=kubernetes" >> "$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"
fi
diff --git a/jjb/engine/scripts/package.sh b/jjb/engine/scripts/package.sh
index 11700a9..38f2955 100755
--- a/jjb/engine/scripts/package.sh
+++ b/jjb/engine/scripts/package.sh
@@ -23,9 +23,9 @@
set -o pipefail
source "$WORKSPACE/change.properties"
-echo "Info : Packaging stack $STACK_TO_PACKAGE"
+echo "Info : Packaging stack $STACK_TYPE"
cd "$WORKSPACE/engine"
-./package.sh -s "$STACK_TO_PACKAGE" -d
+./package.sh -s "$STACK_TYPE" -v "$STACK_VERSION" -d
# vim: set ts=2 sw=2 expandtab:
diff --git a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
index faf27d4..2702466 100644
--- a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@ -30,8 +30,6 @@
- online:
disabled: false
execution-mode: online-deployment
- pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml'
- idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml'
successful: false
failed: false
unstable: false
@@ -39,8 +37,6 @@
- offline:
disabled: false
execution-mode: offline-deployment
- pdf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-pdf.yml'
- idf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-idf.yml'
successful: false
failed: false
unstable: false
@@ -55,10 +51,14 @@
provisioner-type: 'bifrost'
slave-type: 'vpod'
gated-projects: 'infra/engine|infra/provisioner/bifrost'
+ pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml'
+ idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml'
- cloud:
provisioner-type: 'heat'
slave-type: 'jumphost'
gated-projects: 'infra/engine|infra/provisioner/heat'
+ pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-city-ubuntu1804.yaml"
+ idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml"
distro:
- ubuntu1804
@@ -110,11 +110,11 @@
description: 'Name of heat-environment file to use.'
- string:
name: HEAT_STACK_NAME
- default: "nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
+ default: "nordix-cicd-verify-engine-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
description: 'Name of the created stack'
- string:
name: KEYPAIR_NAME
- default: "keypair-nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
+ default: "keypair-nordix-cicd-verify-engine-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
description: 'Name of the created keypair'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE