joid: Create jobs for orange-pod1 and remove brahmaputra jobs

Change-Id: I61b68a7db60193f5525de7151e43b7752e5dd604
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3109fcb..e6b977f 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -91,10 +91,10 @@
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - orange-pod2:
+        - orange-pod1:
             slave-label: '{pod}'
             installer: joid
-            <<: *brahmaputra
+            <<: *master
         - orange-pod5:
             slave-label: '{pod}'
             installer: fuel

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index ab4d7c5..cf4d9cc 100644 (file)
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -16,10 +16,6 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -32,18 +28,12 @@
         - virtual:
             slave-label: joid-virtual
             <<: *master
-        - baremetal:
-            slave-label: joid-baremetal
-            <<: *brahmaputra
-        - virtual:
-            slave-label: joid-virtual
-            <<: *brahmaputra
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - orange-pod2:
-            slave-label: orange-pod2
-            <<: *brahmaputra
+        - orange-pod1:
+            slave-label: orange-pod1
+            <<: *master
         - orange-pod2:
             slave-label: orange-pod2
             <<: *master
@@ -223,29 +213,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-master-trigger'
-    triggers:
-        - timed: ''
-
-# os-nosdn-nofeature-ha trigger - branch: stable/brahmaputra
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -259,29 +235,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-
-# os-odl_l2-nofeature-ha trigger - branch: stable/brahmaputra
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -294,6 +256,10 @@
     name: 'joid-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
     name: 'joid-os-onos-nofeature-ha-orange-pod2-master-trigger'
     triggers:
@@ -313,45 +279,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-sfc-ha-orange-pod2-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-juniper-pod1-master-trigger'
-    triggers:
-        - timed: ''
-
-# os-onos-nofeature-ha trigger - branch: stable/brahmaputra
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-onos-sfc-ha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-sfc-ha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-onos-sfc-ha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -365,29 +301,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger'
+    name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger'
-    triggers:
-        - timed: ''
-
-# os-nosdn-lxd-noha trigger - branch: stable/brahmaputra
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -401,29 +323,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-orange-pod2-master-trigger'
+    name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-juniper-pod1-master-trigger'
-    triggers:
-        - timed: ''
-
-# os-nosdn-lxd-ha trigger - branch: stable/brahmaputra
-- trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-ha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-nosdn-lxd-ha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-nosdn-lxd-ha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -437,28 +345,14 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-orange-pod2-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-noha-juniper-pod1-master-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-
-# os-nosdn-nofeature-noha trigger - branch: stable/brahmaputra
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-noha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-noha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 641ae4e..7c2d5c7 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -402,6 +402,28 @@
             name: CEPH_DISKS
             default: /srv
             description: "Disks to use by ceph (comma separated list)"
+- parameter:
+    name: 'orange-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - orange-pod1
+            default-slaves:
+                - orange-pod1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: CEPH_DISKS
+            default: /dev/sdb /dev/sdc
+            description: "Disks to use by ceph by default (space separated list)"
+        - string:
+            name: EXTERNAL_NETWORK
+            default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26
+            description: "External network to create (name;type;first ip;last ip; gateway;network)"
 - parameter:
     name: 'orange-pod2-defaults'
     parameters:

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index c8d50a0..0d2937c 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -111,11 +111,11 @@
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - orange-pod2:
+        - orange-pod1:
             slave-label: '{pod}'
             installer: joid
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *master
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
@@ -348,6 +348,14 @@
             default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-orange-pod1'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: '-i 104.197.68.199:8086'
+            description: 'Arguments to use in order to choose the backend DB'
+
 - parameter:
     name: 'yardstick-params-orange-pod2'
     parameters: