From 04e6a32c4db43a1004276f60eed6817a1a93ce4d Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Mon, 4 May 2020 07:24:11 +0000
Subject: [PATCH] engine: Enable packaging and offline deployment for kolla

Change-Id: I2f4614e7ab3b7a58b91326991de1e2e33075e784
---
 .../engine-verify-deploy-test.yaml               |  4 ++++
 .../engine-verify-package.yaml                   |  2 +-
 .../kubernetes-offline-deploy-test-jobs.yaml     |  4 ++++
 jjb/engine/scripts/deploy.sh                     |  5 -----
 jjb/engine/scripts/download-artifact.sh          | 13 +++++++++++--
 jjb/engine/scripts/package.sh                    |  9 ++++++---
 jjb/engine/scripts/upload-artifact.sh            | 16 ++++++++++++++--
 7 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml
index 29842b36..5894086f 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-deploy-test.yaml
@@ -180,6 +180,10 @@
           name: NORDIX_ARTIFACT_URL
           default: "$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/gerrit/$GERRIT_CHANGE_NUMBER"
           description: 'Artifact to download'
+      - string:
+          name: CI_LOOP
+          default: "verify"
+          description: 'CI loop the job belongs to'
       - project-parameters:
           project: $GERRIT_PROJECT
           branch: '{branch}'
diff --git a/jjb/engine/engine-verify-jobs/engine-verify-package.yaml b/jjb/engine/engine-verify-jobs/engine-verify-package.yaml
index dd993c4d..bfb83bf5 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-package.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-package.yaml
@@ -159,7 +159,7 @@
       - openstack:
           single-use: True
       - build-timeout:
-          timeout: 70
+          timeout: 240
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
diff --git a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-deploy-test-jobs.yaml b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-deploy-test-jobs.yaml
index ea114184..a386984f 100644
--- a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-deploy-test-jobs.yaml
+++ b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-deploy-test-jobs.yaml
@@ -93,6 +93,10 @@
           name: IDF
           default: '{idf}/${{NODE_NAME}}-idf.yml'
           description: 'IDF file to use for deployment'
+      - string:
+          name: CI_LOOP
+          default: 'periodic'
+          description: 'CI loop type'
 
     properties:
       - logrotate
diff --git a/jjb/engine/scripts/deploy.sh b/jjb/engine/scripts/deploy.sh
index 71b12ce5..56010749 100755
--- a/jjb/engine/scripts/deploy.sh
+++ b/jjb/engine/scripts/deploy.sh
@@ -22,11 +22,6 @@ 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
diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh
index c1bf97ed..3875f83b 100755
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -22,8 +22,17 @@ 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
+  export ARTIFACT_TO_DOWNLOAD="os-installer-ubuntu1804.bsx"
+  export NORDIX_ARM_REPO="nordix-openstack"
+else
+  export ARTIFACT_TO_DOWNLOAD="k8s-installer-ubuntu1804.bsx"
+  export NORDIX_ARM_REPO="nordix-kubernetes"
+fi
+
+if [[ "$CI_LOOP" == "periodic" ]]; then
+  export ARTIFACTS_TO_UPLOAD="$ARTIFACTS_TO_UPLOAD offline-package.tgz"
+else
+  export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/gerrit/$GERRIT_CHANGE_NUMBER"
 fi
 
 if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
diff --git a/jjb/engine/scripts/package.sh b/jjb/engine/scripts/package.sh
index a650f4f6..565826ca 100755
--- a/jjb/engine/scripts/package.sh
+++ b/jjb/engine/scripts/package.sh
@@ -23,11 +23,14 @@ 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
+  export STACK_TO_PACKAGE="kolla"
+else
+  export STACK_TO_PACKAGE="kubespray"
 fi
 
+echo "Info  : Packaging stack $STACK_TO_PACKAGE"
+
 cd "$WORKSPACE/engine"
-./package.sh
+./package.sh -s "$STACK_TO_PACKAGE" -v
 
 # vim: set ts=2 sw=2 expandtab:
diff --git a/jjb/engine/scripts/upload-artifact.sh b/jjb/engine/scripts/upload-artifact.sh
index f5aa6373..c0607d3a 100755
--- a/jjb/engine/scripts/upload-artifact.sh
+++ b/jjb/engine/scripts/upload-artifact.sh
@@ -23,10 +23,22 @@ 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
+  export ARTIFACTS_TO_UPLOAD="os-installer-ubuntu1804.bsx"
+  export NORDIX_ARM_REPO="nordix-openstack"
+else
+  export ARTIFACTS_TO_UPLOAD="k8s-installer-ubuntu1804.bsx"
+  export NORDIX_ARM_REPO="nordix-kubernetes"
+fi
+
+
+if [[ "$CI_LOOP" == "periodic" ]]; then
+  export ARTIFACTS_TO_UPLOAD="$ARTIFACTS_TO_UPLOAD offline-package.tgz"
+else
+  export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/gerrit/$GERRIT_CHANGE_NUMBER"
 fi
 
+echo "Info  : Uploading $ARTIFACTS_TO_UPLOAD to Nordix ARM $NORDIX_ARM_REPO repository"
+
 if [[ "$EXECUTION_MODE" == "packaging" || "$EXECUTION_MODE" == "offline-deployment" ]]; then
   cd /tmp
   for ARTIFACT_TO_UPLOAD in $ARTIFACTS_TO_UPLOAD; do
-- 
2.25.1