engine: Update package macro and gerrit parameters

Change-Id: I3cccaaeffae012c33ce5af1a2428d21a701bd7a4

diff --git a/jjb/engine/scripts/package.sh b/jjb/engine/scripts/package.sh
index c175f5e329a61d2971e337662c8679d4e72fd5e2..07d4f7a4a2f811179a5a5e67b40f278df5cd65c8 100755 (executable)
--- a/jjb/engine/scripts/package.sh
+++ b/jjb/engine/scripts/package.sh
@@ -22,10 +22,4 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
-  echo "Info  : Offline deployment. Proceeding with packaging."
-  cd $WORKSPACE/engine
-  ./package.sh
-else
-  echo "Info  : Online deployment. Skipping packaging."
-fi
+./package.sh

diff --git a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
index e0a47b0a790d7fb0e657b763e6f21f665276537c..0f2eb870a16afca6fed30274938dabf371fe5d20 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@ -81,10 +81,6 @@
     concurrent: true
 
     parameters:
-      - project-parameters:
-          project: $GERRIT_PROJECT
-          branch: '{branch}'
-          description: 'The project and branch which the change is proposed for'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-online-{distro}'
@@ -169,6 +165,11 @@
           name: ARTIFACT_TO_DOWNLOAD
           default: "https://artifactory.nordix.org/artifactory/nordix-kubernetes/installer/oss/gerrit/$GERRIT_CHANGE_ID/k8s-installer-ubuntu1804.bsx"
           description: 'Artifact to download'
+      - project-parameters:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+          description: 'The project and branch which the change is proposed for'
+      - nordix-gerrit-parameters
 
     properties:
       - logrotate