X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yml;h=a2248a425ad5b16166d8403f7aec8e2eedb8b7d0;hb=7f604233ab66b31bd15b60396fbe6f6466fa6fc4;hp=d1e8f262cc8f968077706ca229b12466f9299b1a;hpb=a8f7054c6691852c58c0fd68961a4302c101e20c;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index d1e8f262c..a2248a425 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -55,8 +55,6 @@
         - 'functest-odl-test-{pod}'
         - 'functest-vims-{installer}-{stream}'
         - 'functest-vping-test-{pod}'
-        - 'functest-daily-{stream}'
-        - 'functest-merge-{stream}'
         - 'functest-verify-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -168,7 +166,7 @@
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-all'
-        - 'functest-store-results'
+#       - 'functest-store-results'
 
 - job-template:
     name: functest-{installer}-{stream}
@@ -202,7 +200,7 @@
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-all'
-        - 'functest-store-results'
+#       - 'functest-store-results'
 
 - job-template:
     name: functest-vims-{installer}-{stream}
@@ -235,42 +233,6 @@
     builders:
         - 'functest-vims'
 
-- job-template:
-    name: 'functest-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    varsetabove: '{somevar}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - functest-parameter:
-            gs-pathname: '{gs-pathname}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{stream}'
-
-    triggers:
-        - 'functest-{stream}'
-
-    prebuilders:
-        - test-macro
-
-    builders:
-        - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
-
-    postbuilders:
-        - test-macro
-
 - job-template:
     name: 'functest-verify-{stream}'
 
@@ -305,44 +267,8 @@
                     branch-pattern: '**/{branch}'
 
     builders:
-        - shell:
-            echo "Hello World"
-
-- job-template:
-    name: 'functest-merge-{stream}'
-
-    # 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: '{branch}'
-
-    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: 'functest'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-
-    builders:
-        - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
+        - shell: |
+            echo "Nothing to verify!"
 
 ########################
 # parameter macros