Update GBP OS branch to stable/pike

Update GBP OS branch to stable/pike and remove the
image from defaults.

Change-Id: Ie210b384717569788234c538c456cf6f85619d6e
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 1200269dad8ec12bf95d4275571154f9d4161442..78babf2d5a40b9e40652cdc036c089bb44ec515b 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -75,7 +75,6 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 8b4b546395cc569bebb29ec70a0b8894a9cb5cd8..57d8b73a6ba6a0dea9985ec61a38a28f1e820b66 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -27,9 +27,9 @@
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
 
     public-bridge: 'br-int'