From 549e1d65dfa18caca34a3bb49e5ec3d3cf1f6d29 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Fri, 17 Apr 2020 14:56:46 +0000 Subject: [PATCH] engine: Update package macro and gerrit parameters Change-Id: I3cccaaeffae012c33ce5af1a2428d21a701bd7a4 --- jjb/engine/scripts/package.sh | 8 +------- jjb/engine/verify-jobs/engine-verify-deploy-test.yaml | 9 +++++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/jjb/engine/scripts/package.sh b/jjb/engine/scripts/package.sh index c175f5e32..07d4f7a4a 100755 --- 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 e0a47b0a7..0f2eb870a 100644 --- 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 -- 2.25.1