Merge "JIRA: AEGIS-458 scm removed fron test job tempate * add export LC_ALL="en_US...

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
index b9f68c503dfb2f43068fdf82416eb979908b5694..4add3aaf74f45f712123d6648ade2e39784d5b6c 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
@@ -292,15 +292,6 @@
       - mask-passwords
       - fix-workspace-permissions
 
-    scm:
-      - git:
-          url: https://gerrit.nordix.org/infra/test.git
-          branches:
-            - master
-          timeout: 15
-          wipe_workspace: true
-          clean_before: false
-
     builders:
       - 'test-package-macro'
       - 'xtesting-upload-artifact-macro'

diff --git a/jjb/cloud-infra/scripts/package.sh b/jjb/cloud-infra/scripts/package.sh
index 642d5b9940d7e72a950f59d14dccd162d03b3a5f..1ad9b192414158fbb431032d722b238b58831fc2 100755 (executable)
--- a/jjb/cloud-infra/scripts/package.sh
+++ b/jjb/cloud-infra/scripts/package.sh
@@ -40,6 +40,8 @@ fi
 
 echo "Info  : Packaging stack $STACK_TYPE"
 
+export LC_ALL="en_US.UTF-8"
+
 cd "$WORKSPACE/engine"
 ./package.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -d "$DISTRO" -v
 

diff --git a/jjb/cloud-infra/scripts/upload-xtesting-artifact.sh b/jjb/cloud-infra/scripts/upload-xtesting-artifact.sh
index 10e3d43a4ece745b4e989698520fcbc519a34c1f..bdfdad124e577f1e01a962f33e32d3af54355098 100755 (executable)
--- a/jjb/cloud-infra/scripts/upload-xtesting-artifact.sh
+++ b/jjb/cloud-infra/scripts/upload-xtesting-artifact.sh
@@ -22,12 +22,12 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-test-${STACK_VERSION}.bsx"
-echo "Info  : Uploading $BUILD_ARTIFACTS to Nordix ARM $NORDIX_ARM_REPO repository"
+# export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-test-${STACK_VERSION}.bsx"
+echo "Info  : Uploading $OFFLINE_XTESTING_FILE to Nordix ARM $NORDIX_ARM_REPO repository"
 
 if [[ "$EXECUTION_MODE" == "packaging" || "$EXECUTION_MODE" == "offline-deployment" ]]; then
   cd /tmp
-  for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
+  for BUILD_ARTIFACT in $OFFLINE_XTESTING_FILE; do
     echo "Info  : Generating checksums for $BUILD_ARTIFACT"
     ARTIFACT_MD5SUM=$(md5sum $BUILD_ARTIFACT | cut -d' ' -f1)
     ARTIFACT_SHASUM=$(shasum $BUILD_ARTIFACT | cut -d' ' -f1)