engine: Enable packaging and offline deployment for kolla

Change-Id: I2f4614e7ab3b7a58b91326991de1e2e33075e784

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 29842b361c633c1f6e7b339322b6469129d4a9fd..5894086f4b4442cae8953eff6fefa23ae38f1c91 100644 (file)
--- 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'
           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}'
       - 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 dd993c4d622be0f198a7f7ab8776c6730b5ba349..bfb83bf5b910dc1e1e73399f68601406068462a5 100644 (file)
--- 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:
       - openstack:
           single-use: True
       - build-timeout:

-          timeout: 70
+          timeout: 240

       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
       - 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 ea1141849c162b7d19618418235fe07cab6fff47..a386984ff6248003b320be825fa401b202632aff 100644 (file)
--- 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'
           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
 
     properties:
       - logrotate

diff --git a/jjb/engine/scripts/deploy.sh b/jjb/engine/scripts/deploy.sh
index 71b12ce5479b3549f8d05f053fe49f8e05e3af26..56010749b6965ea4df69c874185c592d72b4421a 100755 (executable)
--- 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
 
 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
 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 c1bf97ed01640e62cff5ac6763053d7bd7029a49..3875f83be529ec5c4c184881b1487151188320ea 100755 (executable)
--- 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
 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
 fi
 
 if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then

diff --git a/jjb/engine/scripts/package.sh b/jjb/engine/scripts/package.sh
index a650f4f64c80e21847199a534fbd73f65ef0f6b7..565826ca3c20cf8fceced35d4c120e3f5a71aaf6 100755 (executable)
--- 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
 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
 
 fi
 

+echo "Info  : Packaging stack $STACK_TO_PACKAGE"
+

 cd "$WORKSPACE/engine"
 cd "$WORKSPACE/engine"

-./package.sh
+./package.sh -s "$STACK_TO_PACKAGE" -v

 
 # vim: set ts=2 sw=2 expandtab:
 
 # vim: set ts=2 sw=2 expandtab:

diff --git a/jjb/engine/scripts/upload-artifact.sh b/jjb/engine/scripts/upload-artifact.sh
index f5aa6373bd053a1ad6a9f5bafbe87b33805fa3a6..c0607d3af30ee73dfe4d66400099170029805c5e 100755 (executable)
--- 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
 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
 
 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
 if [[ "$EXECUTION_MODE" == "packaging" || "$EXECUTION_MODE" == "offline-deployment" ]]; then
   cd /tmp
   for ARTIFACT_TO_UPLOAD in $ARTIFACTS_TO_UPLOAD; do