From: Fatih Degirmenci Date: Wed, 29 Apr 2020 14:04:52 +0000 (+0000) Subject: engine: Adapt verify jobs for infra/installer/kolla repository X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=5410f0f440f1c6c724fc99bd907b6f91c0a82032;p=infra%2Fcicd.git engine: Adapt verify jobs for infra/installer/kolla repository Artifact packaging, upload, download, offline deployment and testing are kept disabled for Kolla until the functionality becomes available. The rest of the jobs should continue working. Change-Id: If5813f01e6a7184daca28e8a056e2c45affc1518 --- diff --git a/jjb/engine/scripts/deploy.sh b/jjb/engine/scripts/deploy.sh index 0f4ab73d2..71b12ce54 100755 --- a/jjb/engine/scripts/deploy.sh +++ b/jjb/engine/scripts/deploy.sh @@ -22,11 +22,22 @@ set -o nounset set -o errexit set -o pipefail +if [[ "$EXECUTION_MODE" == "offline-deployment" && "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then + echo "Info : Offline deployments are not supported for $GERRIT_PROJECT" + exit 0 +fi + if [[ "$EXECUTION_MODE" == "offline-deployment" && "$PROVISIONER_TYPE" == "heat" ]]; then echo "Info : Offline deployments on cloud instances is not currently supported!" 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 + if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then ENGINE_ROOT_DIR="/opt/engine/offline/git/engine" else diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh index 9b1f667f2..c1bf97ed0 100755 --- a/jjb/engine/scripts/download-artifact.sh +++ b/jjb/engine/scripts/download-artifact.sh @@ -21,6 +21,11 @@ set -o nounset set -o errexit +if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then + echo "Info : Artifact download is not enabled for $GERRIT_PROJECT repository" + exit 0 +fi + if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then # ensure we delete leftovers due to lack of disk space sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD ~/.ara \ diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh index e94201125..b43628f1e 100755 --- a/jjb/engine/scripts/functest.sh +++ b/jjb/engine/scripts/functest.sh @@ -22,11 +22,22 @@ set -o nounset set -o errexit set -o pipefail +if [[ "$EXECUTION_MODE" == "offline-deployment" && "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then + echo "Info : Offline testing are not supported for $GERRIT_PROJECT" + exit 0 +fi + if [[ "$EXECUTION_MODE" == "offline-deployment" && "$SLAVE_LABEL" != "baremetal-deploy" ]]; then echo "Info : Testing of offline deployments is not currently supported!" 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 \ /opt/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/dib \ @@ -38,4 +49,4 @@ cd $HOME && /bin/rm -rf $WORKSPACE git clone -q $TEST_REPO_URL $WORKSPACE cd $WORKSPACE/test -./test.sh -f $TEST_FW -t $TEST_SUITE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER +./test.sh -f $TEST_FW -t $TEST_SUITE -i $INSTALLER_TYPE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER diff --git a/jjb/engine/scripts/package.sh b/jjb/engine/scripts/package.sh index 4815fd8c4..a650f4f64 100755 --- a/jjb/engine/scripts/package.sh +++ b/jjb/engine/scripts/package.sh @@ -22,6 +22,11 @@ set -o nounset set -o errexit set -o pipefail +if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then + echo "Info : Packaging is not enabled for $GERRIT_PROJECT repository" + exit 0 +fi + cd "$WORKSPACE/engine" ./package.sh diff --git a/jjb/engine/scripts/upload-artifact.sh b/jjb/engine/scripts/upload-artifact.sh index 97bb13636..f5aa6373b 100755 --- a/jjb/engine/scripts/upload-artifact.sh +++ b/jjb/engine/scripts/upload-artifact.sh @@ -22,6 +22,11 @@ set -o nounset set -o errexit set -o pipefail +if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then + echo "Info : Artifact upload is not enabled for $GERRIT_PROJECT repository" + exit 0 +fi + if [[ "$EXECUTION_MODE" == "packaging" || "$EXECUTION_MODE" == "offline-deployment" ]]; then cd /tmp for ARTIFACT_TO_UPLOAD in $ARTIFACTS_TO_UPLOAD; do