From f7897e0ea19c8caaa5293d81a27b633a3ca4c6d2 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 9 Dec 2015 21:05:00 +0100
Subject: [PATCH] First version of joid deploy job on intel pod5

Change-Id: Id0c23c86c2144316d0067266df6f768d9bcaed15
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/joid/{opnfv-joid.yml => joid.yml} | 29 +++++++++++++++--------------
 jjb/opnfv/pod-params.yml              | 19 +++++++++++++++++--
 2 files changed, 32 insertions(+), 16 deletions(-)
 rename jjb/joid/{opnfv-joid.yml => joid.yml} (69%)

diff --git a/jjb/joid/opnfv-joid.yml b/jjb/joid/joid.yml
similarity index 69%
rename from jjb/joid/opnfv-joid.yml
rename to jjb/joid/joid.yml
index 4d99e3199..e4e04379b 100644
--- a/jjb/joid/opnfv-joid.yml
+++ b/jjb/joid/joid.yml
@@ -3,14 +3,12 @@
 ########################
 - project:
 
-    name: 'opnfv-joid'
+    name: 'joid'
 
     installer: 'joid'
 
     controller:
-        - 'opencontrail'
-        - 'opendaylight'
-        - 'onos'
+        - 'odl'
 
     pod: 'intel-pod5'
 
@@ -20,23 +18,23 @@
             gs-pathname: ''
 
     jobs:
-        - 'opnfv-joid-{controller}-daily-{stream}'
-        - 'opnfv-joid-daily-deploy-{stream}'
+        - 'joid-{controller}-daily-{stream}-{pod}'
+        - 'joid-daily-deploy-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'opnfv-joid-{controller}-daily-{stream}'
+    name: 'joid-{controller}-daily-{stream}-{pod}'
 
-    disabled: true
+    disabled: false
 
     concurrent: false
 
     parameters:
         - project-parameter:
             project: '{installer}'
-        - '{pod}-defaults'
+        - 'opnfv-build-defaults'
         - '{installer}-defaults':
             controller: '{controller}'
 
@@ -48,16 +46,16 @@
 
     builders:
         - trigger-builds:
-          - project: 'opnfv-joid-daily-deploy-{stream}'
+          - project: 'joid-daily-deploy-{stream}'
             git-revision: true
             block: true
             predefined-parameters:
                 CONTROLLER='{controller}'
 
 - job-template:
-    name: 'opnfv-joid-daily-deploy-{stream}'
+    name: 'joid-daily-deploy-{stream}'
 
-    disabled: true
+    disabled: false
 
     concurrent: false
 
@@ -80,6 +78,9 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Hello World from OPNFV $INSTALLER_NAME"
             echo "Running $INSTALLER_NAME with controller $CONTROLLER"
-
+            echo "Please note that this is a quick try to see how joid deployment works"
+            cd $WORKSPACE/ci
+            ./clean.sh
+            ./02-maasdeploy.sh intelpod5
+            ./deploy.sh -o liberty -s $CONTROLLER -t ha -l intelpod5
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index fb02e7d5d..6bddb66c0 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -90,9 +90,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intelpod5-jumphost
+                - intel-us-deploy-bare-pod5
             default-slaves:
-                - intelpod5-jumphost
+                - intel-us-deploy-bare-pod5
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -158,3 +158,18 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on the jumphost'
+
+- parameter:
+    name: 'opnfv-build-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Label on Jenkins'
+            allowed-slaves:
+                - opnfv-build
+            default-slaves:
+                - opnfv-build
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the jumphost'
-- 
2.16.6