From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 11 Jul 2019 21:01:43 +0000 (+0000)
Subject: Merge "Update global-jjb to v0.39.1"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=3f07b7f362fcac175e24d1761ed2bbc3120ec216;hp=064241b3382bbf1b5b4591c898718d6c6db7d4b1

Merge "Update global-jjb to v0.39.1"
---

diff --git a/jjb/iec/iec-compass-build.sh b/jjb/iec/iec-compass-build.sh
index 96ce02e..b403230 100755
--- a/jjb/iec/iec-compass-build.sh
+++ b/jjb/iec/iec-compass-build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 check_env(){
   #Checking python-pip software status. If failed, reinstall it.
diff --git a/jjb/iec/iec-compass-deploy.sh b/jjb/iec/iec-compass-deploy.sh
index b5e0c58..dbb1c1e 100755
--- a/jjb/iec/iec-compass-deploy.sh
+++ b/jjb/iec/iec-compass-deploy.sh
@@ -1,26 +1,44 @@
 #!/bin/bash
-set -e
+set -ex
 
 cd compass4nfv
 
-# Create 3 virtual machine
-echo -e "  - name: host3\n    roles:\n      - kube_node" >> deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml
-# Remove useless code
-# The ansible-kubernetes.yml file contains the list of softwares which will
-# be installed on VM. But for IEC projects, some parts are not essnetial. So
-# useless part will be removed.
-# Delete some contents from line 28 to end.
-sed -i '28,$d' deploy/adapters/ansible/kubernetes/ansible-kubernetes.yml
+config_vm(){
+  # Create 3 virtual machine
+  echo -e "  - name: host3\n    roles:\n      - kube_node" >> deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml
+  # Remove useless code
+  # The ansible-kubernetes.yml file contains the list of softwares which will
+  # be installed on VM. But for IEC projects, some parts are not essnetial. So
+  # useless part will be removed.
+  # Delete some contents from line 28 to end.
+  sed -i '28,$d' deploy/adapters/ansible/kubernetes/ansible-kubernetes.yml
 
-export ADAPTER_OS_PATTERN='(?i)ubuntu-16.04.*arm.*'
-export OS_VERSION="xenial"
-export KUBERNETES_VERSION="v1.13.0"
+  export ADAPTER_OS_PATTERN='(?i)ubuntu-16.04.*arm.*'
+  export OS_VERSION="xenial"
+  export KUBERNETES_VERSION="v1.13.0"
 
-export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml"
-export NETWORK="deploy/conf/vm_environment/network.yml"
-export VIRT_NUMBER=3 VIRT_CPUS=4 VIRT_MEM=12288 VIRT_DISK=50G
+  export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml"
+  export NETWORK="deploy/conf/vm_environment/network.yml"
+  export VIRT_NUMBER=3 VIRT_CPUS=4 VIRT_MEM=12288 VIRT_DISK=50G
+}
+
+modify_workdir(){
+  # When deploying the OS by compass, long path will cause the deploying system failed.
+  # we will create a soft link to walk around this problem.
+  COMPASS_WORK_DIR=${HOME}/compass-work
+
+  ln -sfn $(pwd)/work $COMPASS_WORK_DIR
+
+  sed -i "s#\$COMPASS_DIR/work#$COMPASS_WORK_DIR#g" deploy/launch.sh
+}
+
+config_vm
+
+modify_workdir
 
 ./deploy.sh
 
 echo "Compass Deploy successful"
+
+rm -rf "$COMPASS_WORK_DIR"
 exit 0
diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml
index 0325951..dbcba48 100644
--- a/jjb/validation/validation-docker.yaml
+++ b/jjb/validation/validation-docker.yaml
@@ -126,7 +126,7 @@
           settings-file: '{mvn-settings}'
       - shell: |
           #!/bin/bash -ex
-          make -C docker push-all
+          make -k -C docker push-all
 
 - job-template:
     name: 'validation-docker-manifest-{stream}'
@@ -158,7 +158,7 @@
           settings-file: '{mvn-settings}'
       - shell: |
           #!/bin/bash -ex
-          for sd in docker/*/.; do make -C $sd .push_manifest; done
+          for sd in docker/*/.; do make -k -C $sd .push_manifest; done
 
 # parameter macro
 - parameter: