From b112bafb1e00ab9f0c8c5ecd8c3f93dde8506f23 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 23 Jun 2020 09:32:32 +0000 Subject: [PATCH] Adapt test jobs to stack oriented framework Change-Id: If7ac1c111918b28a6f6d16b3108ce75b0e8f9b11 --- jjb/engine/scripts/download-artifact.sh | 2 +- jjb/engine/scripts/functest.sh | 12 ++++-------- jjb/engine/scripts/generate-change-metadata.sh | 1 + jjb/engine/scripts/package.sh | 4 ++-- .../verify-jobs/engine-verify-deploy-test.yaml | 12 ++++++------ 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh index 2257c011e..68e8d0399 100755 --- a/jjb/engine/scripts/download-artifact.sh +++ b/jjb/engine/scripts/download-artifact.sh @@ -24,7 +24,7 @@ set -o errexit 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 b43628f1e..14a2b0cb7 100755 --- a/jjb/engine/scripts/functest.sh +++ b/jjb/engine/scripts/functest.sh @@ -32,14 +32,8 @@ if [[ "$EXECUTION_MODE" == "offline-deployment" && "$SLAVE_LABEL" != "baremetal- 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 @@ cd $HOME && /bin/rm -rf $WORKSPACE 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 f02b34806..680042298 100755 --- a/jjb/engine/scripts/generate-change-metadata.sh +++ b/jjb/engine/scripts/generate-change-metadata.sh @@ -87,6 +87,7 @@ else 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 11700a957..38f2955b8 100755 --- a/jjb/engine/scripts/package.sh +++ b/jjb/engine/scripts/package.sh @@ -23,9 +23,9 @@ set -o errexit 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 faf27d461..2702466c1 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 -- 2.25.1