X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fqtip.yml;h=fac9c333cbb10fcc63122ee4b91b21b98f5d6045;hb=53f04f43283d98605fc5b3de28c08756842d3f27;hp=c08b1ca50f7c3f98979f440dcba9a2776d0cd7b8;hpb=9f91697aaef0465dda0b0ad488c9585d28aa7c6f;p=releng.git

diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index c08b1ca50..fac9c333c 100644
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -1,80 +1,38 @@
 - project:
     name: qtip
+
+    project: '{name}'
+
     jobs:
-        - 'qtip-test'
-        - 'qtip-daily-{stream}'
-        - 'qtip-merge'
-        - 'qtip-verify'
+        - 'qtip-verify-{stream}'
         - 'qtip-dhrystone-serial-{pod}'
         - 'qtip-ssl-parallel-{pod}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
-
     pod:
         - dell-build:
            node: 'dell-us-testing-bm-1'
            installer_type: 'fuel'
            installer_ip: '10.20.0.2'
 
+# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: 'master'
-
-    project: 'qtip'
-    somevar: 'foo'
-
-- job-template:
-    name: qtip-test
-
-    builders:
-        - shell: |
-            echo "Hello world from qtip"
+            gs-pathname: ''
+#        - brahmaputra:
+#            branch: 'stable/brahmaputra'
+#            gs-pathname: '/brahmaputra'
 
 - job-template:
-    name: 'qtip-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    varsetabove: '{somevar}'
+    name: 'qtip-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
+        - gerrit-parameter:
             branch: '{branch}'
+        - 'opnfv-build-defaults'
 
-    triggers:
-        - timed: 'H H * * *'
-
-    prebuilders:
-        - test-macro
-
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from qtip {somevar} daily"
-
-    postbuilders:
-        - test-macro
-
-- job-template:
-    name: 'qtip-verify'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -95,54 +53,17 @@
                     comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'qtip'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**|.gitignore'
 
     builders:
         - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
-
-- job-template:
-    name: 'qtip-merge'
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'qtip'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
+            echo "Nothing to verify!"
 
 - job-template:
     name: 'qtip-dhrystone-serial-{pod}'
@@ -214,7 +135,7 @@
       - 'qtip-ssl-parallel'
 
     triggers:
-      - timed: "@midnight"
+      - timed: '0 0,11,18 * * *'
 
 ###########################
 #biuilder macros
@@ -225,11 +146,11 @@
     builders:
         - shell: |
             #! /bin/bash
-            if [[ ! -f $WORKSPACE/opnfv-openrc.sh ]]; then
-               echo "Unable to access file $WORKSPACE/opnfv-openrc.sh"
+            if [[ ! -f $WORKSPACE/opnfv-stack.sh ]]; then
+               echo "Unable to access file $WO:qRKSPACE/opnfv-openrc.sh"
                exit 1
             fi
-            source $WORKSPACE/opnfv-openrc.sh
+            source $WORKSPACE/opnfv-stack.sh
             cd $WORKSPACE
             echo "Running QTIP dhrystone with First Test case"
             python qtip.py -s compute -b dhrystone_serial.yaml
@@ -240,11 +161,11 @@
     builders:
         - shell: |
             #!/bin/bash
-            if [[ ! -f $WORKSPACE/opnfv-openrc.sh ]]; then
+            if [[ ! -f $WORKSPACE/opnfv-stack.sh ]]; then
                echo "Unable to access file $WORKSPACE/opnfv-openrc.sh"
                exit 1
             fi
-            source $WORKSPACE/opnfv-openrc.sh
+            source $WORKSPACE/opnfv-stack.sh
             cd $WORKSPACE
             echo "Running QTIP dhrystone with Second Test case"
             python qtip.py -s compute -b ssl_parallel.yaml
@@ -258,5 +179,5 @@
             cd $WORKSPACE
             git clone https://gerrit.opnfv.org/gerrit/releng
             cd $WORKSPACE/releng/utils
-            ./fetch_os_creds.sh                  #To test the problem with creating the file in $HOME
-            ./fetch_os_creds.sh -d $WORKSPACE    #To test if  the file can be created in $WORKSPACE
+            #./fetch_os_creds.sh                  #To test the problem with creating the file in $HOME
+            ./fetch_os_creds.sh -d $WORKSPACE/opnfv-stack.sh    #To test if  the file can be created in $WORKSPACE