X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-plugin-verify-jobs.yml;h=4fea26b32b05f3d993d43570503f36e82c97164e;hb=4fbf1fa53a95d4af82a826c6d2dd6b49a63fd319;hp=affc705f319a38fddd88a1d7fee783c023f4c615;hpb=609bf2f9c9c6885b0a1c6acf292e33d80bf1c3f7;p=releng.git

diff --git a/jjb/fuel/fuel-plugin-verify-jobs.yml b/jjb/fuel/fuel-plugin-verify-jobs.yml
index affc705f3..4fea26b32 100644
--- a/jjb/fuel/fuel-plugin-verify-jobs.yml
+++ b/jjb/fuel/fuel-plugin-verify-jobs.yml
@@ -9,7 +9,8 @@
 #####################################
     stream:
         - master:
-            branch: '{stream}'
+            upstream-branch: '{stream}'
+            opnfv-branch: 'experimental'
             gs-pathname: ''
             disabled: false
 #####################################
@@ -44,11 +45,23 @@
             max-total: 4
             option: 'project'
 
-    # the url to plugin repo can essentially become a variable if
-    # the plugin name is injected to env by gerrit plugin
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{upstream-branch}'
+            description: 'OpenStack branch to use'
+        - string:
+            name: OPNFV_BRANCH
+            default: '{opnfv-branch}'
+            description: 'OPNFV branch to use'
+        - 'opnfv-build-defaults'
+        - 'fuel-verify-plugin-defaults':
+            gs-pathname: '{gs-pathname}'
+
     scm:
         - git:
-            url: 'https://git.openstack.org/openstack/fuel-plugin-bgpvpn'
+            url: 'https://git.openstack.org/$GERRIT_PROJECT'
             refspec: '$GERRIT_REFSPEC'
             branches:
                 - 'origin/$GERRIT_BRANCH'
@@ -89,21 +102,20 @@
                 project-pattern: 'openstack/fuel-plugin-bgpvpn'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
+                    branch-pattern: '**/{upstream-branch}'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'README.md|.gitignore|.gitreview'
+              - project-compare-type: 'PLAIN'
+                project-pattern: 'openstack/fuel-plugin-onos'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{upstream-branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'README.md|.gitignore|.gitreview'
             readable-message: true
 
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - 'opnfv-build-defaults'
-        - 'fuel-verify-plugin-defaults':
-            gs-pathname: '{gs-pathname}'
-
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
@@ -114,6 +126,7 @@
                 - name: 'fuel-verify-plugin-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    GERRIT_PROJECT=$GERRIT_PROJECT
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -128,6 +141,7 @@
                 - name: 'fuel-verify-plugin-test-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    GERRIT_PROJECT=$GERRIT_PROJECT
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -154,11 +168,24 @@
                 - 'fuel-verify-plugin-test-.*'
             block-level: 'NODE'
 
-    # the url to plugin repo can essentially become a variable if
-    # the plugin name is injected to env by gerrit plugin
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{upstream-branch}'
+            description: 'OpenStack branch to use'
+        - string:
+            name: OPNFV_BRANCH
+            default: '{opnfv-branch}'
+            description: 'OPNFV branch to use'
+        - '{slave-label}-defaults'
+        - '{installer}-defaults'
+        - 'fuel-verify-plugin-defaults':
+            gs-pathname: '{gs-pathname}'
+
     scm:
         - git:
-            url: 'https://git.openstack.org/openstack/fuel-plugin-bgpvpn'
+            url: 'https://git.openstack.org/$GERRIT_PROJECT'
             refspec: '$GERRIT_REFSPEC'
             branches:
                 - 'origin/$GERRIT_BRANCH'
@@ -174,15 +201,6 @@
         - timeout:
             timeout: 360
             fail: true
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - '{slave-label}-defaults'
-        - '{installer}-defaults'
-        - 'fuel-verify-plugin-defaults':
-            gs-pathname: '{gs-pathname}'
 
     builders:
         - description-setter:
@@ -194,18 +212,14 @@
 - builder:
     name: 'fuel-verify-plugin-build-macro'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            echo "Not activated!"
+        - shell:
+            !include-raw: ./fuel-plugin-build.sh
 
 - builder:
     name: 'fuel-verify-plugin-test-macro'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            echo "Not activated!"
+        - shell:
+            !include-raw: ./fuel-plugin-test.sh
 #####################################
 # parameter macros
 #####################################