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: First version of joid deploy job on intel pod5

Change-Id: Id0c23c86c2144316d0067266df6f768d9bcaed15
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/joid/joid.yml        | 86 ++++++++++++++++++++++++++++++++++++++++++++++++
 jjb/joid/opnfv-joid.yml  | 85 -----------------------------------------------
 jjb/opnfv/pod-params.yml | 19 +++++++++--
 3 files changed, 103 insertions(+), 87 deletions(-)
 create mode 100644 jjb/joid/joid.yml
 delete mode 100644 jjb/joid/opnfv-joid.yml

diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
new file mode 100644
index 000000000..e4e04379b
--- /dev/null
+++ b/jjb/joid/joid.yml
@@ -0,0 +1,86 @@
+########################
+# Job configuration for joid
+########################
+- project:
+
+    name: 'joid'
+
+    installer: 'joid'
+
+    controller:
+        - 'odl'
+
+    pod: 'intel-pod5'
+
+    stream:
+        - master:
+            branch: 'master'
+            gs-pathname: ''
+
+    jobs:
+        - 'joid-{controller}-daily-{stream}-{pod}'
+        - 'joid-daily-deploy-{stream}'
+
+########################
+# job templates
+########################
+- job-template:
+    name: 'joid-{controller}-daily-{stream}-{pod}'
+
+    disabled: false
+
+    concurrent: false
+
+    parameters:
+        - project-parameter:
+            project: '{installer}'
+        - 'opnfv-build-defaults'
+        - '{installer}-defaults':
+            controller: '{controller}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    builders:
+        - trigger-builds:
+          - project: 'joid-daily-deploy-{stream}'
+            git-revision: true
+            block: true
+            predefined-parameters:
+                CONTROLLER='{controller}'
+
+- job-template:
+    name: 'joid-daily-deploy-{stream}'
+
+    disabled: false
+
+    concurrent: false
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER: {installer} $CONTROLLER'
+
+    parameters:
+        - project-parameter:
+            project: '{installer}'
+        - '{pod}-defaults'
+        - '{installer}-defaults'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    builders:
+        - shell: |
+            #!/bin/bash
+            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/joid/opnfv-joid.yml b/jjb/joid/opnfv-joid.yml
deleted file mode 100644
index 4d99e3199..000000000
--- a/jjb/joid/opnfv-joid.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-########################
-# Job configuration for joid
-########################
-- project:
-
-    name: 'opnfv-joid'
-
-    installer: 'joid'
-
-    controller:
-        - 'opencontrail'
-        - 'opendaylight'
-        - 'onos'
-
-    pod: 'intel-pod5'
-
-    stream:
-        - master:
-            branch: 'master'
-            gs-pathname: ''
-
-    jobs:
-        - 'opnfv-joid-{controller}-daily-{stream}'
-        - 'opnfv-joid-daily-deploy-{stream}'
-
-########################
-# job templates
-########################
-- job-template:
-    name: 'opnfv-joid-{controller}-daily-{stream}'
-
-    disabled: true
-
-    concurrent: false
-
-    parameters:
-        - project-parameter:
-            project: '{installer}'
-        - '{pod}-defaults'
-        - '{installer}-defaults':
-            controller: '{controller}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    builders:
-        - trigger-builds:
-          - project: 'opnfv-joid-daily-deploy-{stream}'
-            git-revision: true
-            block: true
-            predefined-parameters:
-                CONTROLLER='{controller}'
-
-- job-template:
-    name: 'opnfv-joid-daily-deploy-{stream}'
-
-    disabled: true
-
-    concurrent: false
-
-    wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER: {installer} $CONTROLLER'
-
-    parameters:
-        - project-parameter:
-            project: '{installer}'
-        - '{pod}-defaults'
-        - '{installer}-defaults'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    builders:
-        - shell: |
-            #!/bin/bash
-            echo "Hello World from OPNFV $INSTALLER_NAME"
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
-
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'
-- 
cgit 1.2.3-korg