Merge "add missing rls jobs"

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 5775377..39a8977 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -30,10 +30,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 7c7094f..85293ea 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -17,10 +17,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 53d26e3..c39db40 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -26,15 +26,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-oam-settings'
     maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+    shallow-clone: true
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 

diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
index 1a02f8f..1ab6862 100644 (file)
--- a/jjb/sdnc/sdnc-oom.yaml
+++ b/jjb/sdnc/sdnc-oom.yaml
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
 
     mvn-settings: 'sdnc-oom-settings'
     files: '**'

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index c156150..a9b0bd6 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -54,21 +54,25 @@
           - libxml-xpath-perl
           - wget
           - make
-          - npm
           - sshuttle
           - netcat
           - libssl-dev
           - libffi-dev
-      become: true
-      when: ansible_distribution == 'Ubuntu'
-
-    - name: Install autorelease support packages
-      apt:
-        name:
           - xmlstarlet
           - xvfb
           - crudini
           - maven
           - python-ncclient
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
+          - nodejs-dev
+          - node-gyp
+          - libssl1.0-dev
+          - nodejs
+          - npm
+        update_cache: yes
       become: true
       when: ansible_distribution == 'Ubuntu'

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 7b9f9c0..6c114b5 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -108,22 +108,26 @@
           - libxml-xpath-perl
           - wget
           - make
-          - npm
           - sshuttle
           - netcat
           - libssl-dev
           - libffi-dev
-      become: true
-      when: ansible_distribution == 'Ubuntu'
-
-    - name: Install autorelease support packages
-      apt:
-        name:
           - xmlstarlet
           - xvfb
           - crudini
           - maven
           - python-ncclient
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
+          - nodejs-dev
+          - node-gyp
+          - libssl1.0-dev
+          - nodejs
+          - npm
+        update_cache: yes
       become: true
       when: ansible_distribution == 'Ubuntu'