Merge "Change Bottlenecks Tests Sequence"

diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index 4468da7..9a12305 100644 (file)
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -220,7 +220,7 @@
     builders:
       - shell: |
           cd $WORKSPACE && tox -edocs
-            wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs"
+            wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/build" "docs"
 ################################
 # job publishers
 ################################

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index f473d85..b7335fa 100644 (file)
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -106,6 +106,12 @@
           branches:
             - 'origin/$BRANCH'
           timeout: 15
+          per-build-tag: false
+          shallow-clone: false
+          use-author: false
+          ignore-notify: false
+          wipe-workspace: true
+          prune: false
 
 - scm:
     name: git-scm-gerrit

diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index f8e994c..aac8c31 100644 (file)
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -122,7 +122,7 @@
                 comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'functest|functest-kubernetes|sdnvpn|qtip|daisy|sfc|escalator'
+              project-pattern: 'sdnvpn|qtip|daisy|sfc|escalator'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'

diff --git a/releases/fraser/apex.yaml b/releases/fraser/apex.yaml
index 70f34fa..bbbb2ac 100644 (file)
--- a/releases/fraser/apex.yaml
+++ b/releases/fraser/apex.yaml
@@ -26,4 +26,4 @@ branches:
     location:
       apex-os-net-config: a301f9f0fff8b227562fdec639e66d76dafb4634
 
-release-notes: http://docs.opnfv.org/en/stable-euphrates/submodules/apex/docs/release/release-notes/release-notes.html
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/apex/docs/release/release-notes/release-notes.html