From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Thu, 24 Aug 2017 18:30:47 +0000 (+0200)
Subject: snaps: Configure job to execute run_tests.sh against existing deployment
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=68ee9a9a5a3cdb77d8e48a7d57f633cabdfae532;p=releng.git

snaps: Configure job to execute run_tests.sh against existing deployment

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

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 0e23380a9..f5de021a6 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -884,6 +884,20 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'intel-virtual10-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-virtual10
+            default-slaves:
+                - intel-virtual10
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'doctor-defaults'
     parameters:
diff --git a/jjb/snaps/snaps.yml b/jjb/snaps/snaps-verify-jobs.yml
similarity index 78%
rename from jjb/snaps/snaps.yml
rename to jjb/snaps/snaps-verify-jobs.yml
index 50b7c3070..01ea3e41e 100644
--- a/jjb/snaps/snaps.yml
+++ b/jjb/snaps/snaps-verify-jobs.yml
@@ -15,21 +15,27 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
 
 - job-template:
     name: 'snaps-verify-{stream}'
 
     disabled: '{obj:disabled}'
 
+    concurrent: false
+
     parameters:
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+        - string:
+            name: DEPLOYMENT_HOST_IP
+            default: 192.168.122.2
+            description: 'IP of the deployment node'
+        - string:
+            name: CONTROLLER_IP
+            default: 192.168.122.3
+            description: 'IP of the controller node'
+        - 'intel-virtual10-defaults'
 
     scm:
         - git-scm-gerrit
@@ -60,4 +66,7 @@
 
     builders:
         - shell: |
-            echo "Nothing to verify!"
+            #!/bin/bash
+
+            cd $WORKSPACE/ci
+            ./run_tests.sh $DEPLOYMENT_HOST_IP $CONTROLLER_IP