engine: Update command line arguments to engine

Change-Id: Ie56dbe2ceeaca7206f29324c5f5407e11dbebdb4

diff --git a/jjb/engine/scripts/deploy.sh b/jjb/engine/scripts/deploy.sh
index 0589a8274ff57ac064a7d82995b90ccee4f2725c..d52bbfa5d8c748613be62577fa0f11acd679ad11 100755 (executable)
--- a/jjb/engine/scripts/deploy.sh
+++ b/jjb/engine/scripts/deploy.sh
@@ -37,12 +37,6 @@ else
   ENGINE_ROOT_DIR="$WORKSPACE"
 fi
 
-# TODO (fdegir): this is temporarily here to develop the jobs
-if [[ "$GERRIT_PROJECT" != "infra/engine" ]]; then
-  cd $ENGINE_ROOT_DIR
-  git fetch "https://gerrit.nordix.org/infra/engine" refs/changes/23/4823/18 && git checkout FETCH_HEAD
-fi
-
 # NOTE (fdegir): for bifrost based deployments, we don't need these files so we fake them
 OPENRC_FILE=${OPENRC_FILE:-/tmp/openrc}
 HEAT_ENVIRONMENT_FILENAME=${HEAT_ENVIRONMENT_FILENAME:-/tmp/heat}
@@ -50,6 +44,6 @@ HEAT_ENVIRONMENT_FILENAME=${HEAT_ENVIRONMENT_FILENAME:-/tmp/heat}
 /bin/cp -f $OPENRC_FILE /tmp/openrc
 
 cd "$ENGINE_ROOT_DIR/engine"
-./deploy.sh -d -s "$STACK_TYPE" -v "$STACK_VERSION" -p "$PDF" -i "$IDF" -o /tmp/openrc
+./deploy.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -p "$PDF" -i "$IDF" -o /tmp/openrc -d "$DISTRO" -v
 
 # 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 c9d287bd6e8578bdc43c8d427b7845dcc198c17a..2ad1e5fece6a4c3c07ecbefb0cb953aebdf8c986 100755 (executable)
--- a/jjb/engine/scripts/generate-change-metadata.sh
+++ b/jjb/engine/scripts/generate-change-metadata.sh
@@ -30,8 +30,6 @@ if [[ "$GERRIT_PROJECT" != "infra/engine" ]]; then
   echo "Info : Cloning infra/engine repository"
   git clone -q https://gerrit.nordix.org/infra/engine.git "$WORKSPACE"
   cd "$WORKSPACE"
-  # TODO (fdegir): this is temporarily here to develop the jobs
-  git fetch "https://gerrit.nordix.org/infra/engine" refs/changes/23/4823/18 && git checkout FETCH_HEAD
 fi
 
 # file to record change metadata
@@ -109,8 +107,8 @@ fi
 export NORDIX_ARM_HTTPS_URL="https://artifactory.nordix.org/artifactory"
 export ARTIFACT_ARM_FOLDER="gerrit"
 export BUILD_IDENTIFIER=$GERRIT_CHANGE_NUMBER
-export INSTALLER_FILE="${STACK_TYPE}-ubuntu1804.bsx"
-export BUILD_ARTIFACTS="${STACK_TYPE}-ubuntu1804.bsx"
+export INSTALLER_FILE="${STACK_TYPE}-${DISTRO}.bsx"
+export BUILD_ARTIFACTS="${STACK_TYPE}-${DISTRO}.bsx"
 export NORDIX_ARM_REPO="nordix-${STACK_TYPE}"
 export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/$ARTIFACT_ARM_FOLDER/$BUILD_IDENTIFIER"
 
@@ -118,6 +116,7 @@ cat << EOF >> "$CHANGE_METADATA_FILE"
 BUILD_IDENTIFIER=$BUILD_IDENTIFIER
 BUILD_DATE=$(date '+%Y%m%d%H%M')
 BUILT_BY=$BUILD_URL
+DISTRO=$DISTRO
 CI_LOOP=$CI_LOOP
 ENGINE_SHA=$(git rev-parse HEAD)
 INSTALLER_FILE=${STACK_TYPE}-ubuntu1804.bsx

diff --git a/jjb/engine/scripts/package.sh b/jjb/engine/scripts/package.sh
index 38f2955b82addaa692844dec144319639568da9d..d63d46b0656c2479cbba564b64028d9129c38b52 100755 (executable)
--- a/jjb/engine/scripts/package.sh
+++ b/jjb/engine/scripts/package.sh
@@ -26,6 +26,6 @@ source "$WORKSPACE/change.properties"
 echo "Info  : Packaging stack $STACK_TYPE"
 
 cd "$WORKSPACE/engine"
-./package.sh -s "$STACK_TYPE" -v "$STACK_VERSION" -d
+./package.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -d "$DISTRO" -v
 
 # 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 c4f6f75b0d7d6cc82b2e31f244457f317713f36c..b00de3fadbf8c957aeefd7fe0b0374eabe2225cc 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@ -84,6 +84,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DISTRO
+          default: '{distro}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-{environment-type}-{distro}-fra'

diff --git a/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml b/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
index 02d339bc180890e8207d8c2111408b68f9f91ba0..2ac1df64c682fd35777176c4ea5501cda33f8610 100644 (file)
--- a/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/ironic-verify-deploy-test.yaml
@@ -77,6 +77,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DISTRO
+          default: '{distro}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-{environment-type}-{distro}-fra'

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
index be28b970df4c643df126afd8c0d0d2b2e9543961..45e5f413311a639a38f888d1a92929e9cbe93f81 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@ -91,6 +91,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DISTRO
+          default: '{distro}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-{environment-type}-{distro}-fra'

diff --git a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
index 9d32b986829be9a492aa42382187fcc69f7700db..b2726ca5a31a597e6bdfb0e242cde162cfad75c2 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
@@ -82,6 +82,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DISTRO
+          default: '{distro}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-{environment-type}-{distro}-fra'

diff --git a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
index 62a3fddc28d30a4cddbe09e996cc4fda98f33447..d492e5786dbe2012cf1f28ffdf1783885ebc053b 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
@@ -82,6 +82,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DISTRO
+          default: '{distro}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-{environment-type}-{distro}-fra'