Merge "Fix feature repo add for new distribution"

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index bee0b3638b9444462bf4941701afed3db2a9a699..81c367d2c65fda4ab6364a66c4d6539dd5e4d0e1 100644 (file)
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -59,7 +59,7 @@ pip install --upgrade jsonpatch
 # Module networking-l2gw is required for using l2gw commands with neutron client
 # Module python-neutronclient is needed for certain tests run with Openstack Newton
 #  that does not work with Openstack Client
-pip install python-openstackclient==3.11.0
+pip install python-openstackclient
 pip install networking-l2gw==11.0.0
 pip install python-neutronclient==6.1.0
 pip install networking-sfc

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 3e8cd1db36fd0282755739a552cf8086be283a2d..85e8e3bef2871570898e769d58406a4a0c212224 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -21,7 +21,7 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     archive-artifacts: '**/*.log'
     build-timeout: 30
     jjb-version: 2.0.0
@@ -35,7 +35,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
 
     platforms:
       - centos
@@ -86,7 +86,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     project-type: freestyle
 
@@ -120,7 +120,7 @@
 
 - job-template:
     name: builder-copy-sandbox-logs
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     project-type: freestyle
 
@@ -163,7 +163,7 @@
 - job-template:
     name: 'builder-verify-image-protection'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -207,7 +207,7 @@
 - job-template:
     name: 'builder-cleanup-old-images'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -253,7 +253,7 @@
 - job-template:
     name: builder-delete-orphaned-nodes
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -292,7 +292,7 @@
 - job-template:
     name: 'builder-delete-stale-nodes'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -329,7 +329,7 @@
 - job-template:
     name: 'builder-delete-stale-stacks'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -368,7 +368,7 @@
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index 8ae7b09fbd832181b1d6f4efbf6351ebe275bda1..99b39487dcc905abebe8956cb6b9920e3c6dd37b 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -9,7 +9,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     build-timeout: 90
 
     platforms: centos
@@ -25,7 +25,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     build-timeout: 60
 
     platforms: centos
@@ -41,7 +41,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     build-timeout: 90
 
     platforms: ubuntu-16.04
@@ -57,7 +57,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
 
     platforms: centos
     templates: robot