Merge "Add DOCKERHUB_REGISTRY global var to prod Jenkins"

diff --git a/jjb/iec/iec-compass-deploy.sh b/jjb/iec/iec-compass-deploy.sh
index e3dd4e8..e77810b 100755 (executable)
--- a/jjb/iec/iec-compass-deploy.sh
+++ b/jjb/iec/iec-compass-deploy.sh
@@ -3,5 +3,21 @@ set -e
 
 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
+sed -i "33,90d" 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"
+if [[ "$NODE_NAME" =~ "-virtual" ]]; then
+    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=2 VIRT_MEM=4096 VIRT_DISK=50G
+fi
+
+./deploy.sh
+
 echo "Compass Deploy successful"
 exit 0

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index 4cb9440..faab545 100644 (file)
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -63,6 +63,10 @@
           name: CI_DEBUG
           default: 'false'
           description: 'Show debug output information'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '**/*.log'
+          description: Artifacts to archive to the logs server.
 - parameter:
     name: 'seba_on_arm-defaults'
     parameters:
@@ -199,6 +203,7 @@
     publishers:
       - email:
           recipients: armband@enea.com
+      - lf-infra-publish
 
 - job-template:
     name: 'iec-install-{usecase}-{deploy-type}-daily-{stream}'
@@ -238,6 +243,7 @@
     publishers:
       - email:
           recipients: armband@enea.com
+      - lf-infra-publish
 
 ########################
 # trigger macros