Merge "[daisy] Tagging for Fraser release"

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 0bf750b..5bf64c1 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -164,9 +164,7 @@
             - condition-kind: day-of-week
               day-selector: select-days
               days:
-                MON: true
-                WED: true
-                FRI: true
+                SAT: true
               use-build-time: true
           steps:
             - trigger-builds:
@@ -189,7 +187,7 @@
             - condition-kind: day-of-week
               day-selector: select-days
               days:
-                TUES: true
+                SUN: true
               use-build-time: true
           steps:
             - trigger-builds:

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 5f82803..88fb026 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -276,7 +276,7 @@
               label: '{scenario}'
           steps:
             - trigger-builds:
-                - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
@@ -286,7 +286,7 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-                - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
@@ -296,7 +296,7 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-                - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}

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

diff --git a/releases/fraser/armband.yml b/releases/fraser/armband.yml
index ae2e44d..66afd10 100644 (file)
--- a/releases/fraser/armband.yml
+++ b/releases/fraser/armband.yml
@@ -1,9 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: armband
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      armband: 2b0ac4026a3acf3b10ab2f4c416636d80ab559f0
+
 branches:
   - name: stable/fraser
     location:
       armband: 46040c0ab85aeba942b7ec7897b32243f859aac0
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/armband/docs/release/release-notes/release-notes.html

diff --git a/releases/fraser/auto.yaml b/releases/fraser/auto.yaml
index fa2f58b..a86fabb 100644 (file)
--- a/releases/fraser/auto.yaml
+++ b/releases/fraser/auto.yaml
@@ -3,7 +3,14 @@ project: auto
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      auto: 3a957a75f99686767d13f45d74b5ca8463559b7b
+
 branches:
   - name: stable/fraser
     location:
       auto: 5c8112dd4434e726da1325b0a699b9839f2f3d6b
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/auto/docs/release/release-notes/Auto-release-notes.html

diff --git a/releases/fraser/bottlenecks.yaml b/releases/fraser/bottlenecks.yaml
index 778e6ed..e72d0f6 100644 (file)
--- a/releases/fraser/bottlenecks.yaml
+++ b/releases/fraser/bottlenecks.yaml
@@ -3,7 +3,15 @@ project: bottlenecks
 project-type: testing
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      bottlenecks: d76736440f852baed2e10a9b92c0557aabc041a6
+
 branches:
   - name: stable/fraser
     location:
       bottlenecks: d10c4644d44f707998c7f05dc72ec4913576b752
+
+release-notes:
+  http://docs.opnfv.org/en/stable-fraser/submodules/bottlenecks/docs/release/release-notes/release_notes.html

diff --git a/releases/fraser/clover.yaml b/releases/fraser/clover.yaml
index 91758cd..cb62737 100644 (file)
--- a/releases/fraser/clover.yaml
+++ b/releases/fraser/clover.yaml
@@ -3,7 +3,14 @@ project: clover
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      clover: aae68d3d9dbb8baa3cadef134e6e045ad79f1f57
+
 branches:
   - name: stable/fraser
     location:
       clover: 67b7fb49e6ea6ac9c2547af263355e5f1aeade42
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/clover/docs/release/release-notes/release-notes.html

diff --git a/releases/fraser/compass4nfv.yaml b/releases/fraser/compass4nfv.yaml
index 5b5c777..5386ce4 100644 (file)
--- a/releases/fraser/compass4nfv.yaml
+++ b/releases/fraser/compass4nfv.yaml
@@ -10,3 +10,7 @@ branches:
   - name: stable/fraser
     location:
       compass-containers: 15a7cbc925bed896c3c09a5635454c33dbffbadc
+
+# yamllint disable rule:line-length
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/compass4nfv/docs/release/release-notes/release-notes.html
+# yamllint enable rule:line-length

diff --git a/releases/fraser/doctor.yaml b/releases/fraser/doctor.yaml
index bc74a03..28cfe7b 100644 (file)
--- a/releases/fraser/doctor.yaml
+++ b/releases/fraser/doctor.yaml
@@ -1,9 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 Nokia Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: doctor
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      doctor: cd500723c3b2de3655b2dc56ea9647f358183264
+
 branches:
   - name: stable/fraser
     location:
       doctor: 06980156b3eed6a6e456d3105c70b68386c1dfb7
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/doctor/docs/release/release-notes/releasenotes.html

diff --git a/releases/fraser/fuel.yaml b/releases/fraser/fuel.yaml
index d0b7b19..226ba58 100644 (file)
--- a/releases/fraser/fuel.yaml
+++ b/releases/fraser/fuel.yaml
@@ -1,9 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: fuel
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      fuel: d45841926790df8313912697d31753c120e2c4aa
+
 branches:
   - name: stable/fraser
     location:
       fuel: e083cf6350a227da161b07d2c68d9aa200611b32
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/fuel/docs/release/release-notes/release-notes.html

diff --git a/releases/fraser/ipv6.yaml b/releases/fraser/ipv6.yaml
index 853847c..2e92199 100644 (file)
--- a/releases/fraser/ipv6.yaml
+++ b/releases/fraser/ipv6.yaml
@@ -1,8 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: ipv6
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      ipv6: 5b914695088b39aee3886bd60be4707b7a11a1e8
+
 branches:
   - name: stable/fraser
     location:

diff --git a/releases/fraser/joid.yaml b/releases/fraser/joid.yaml
index c2ca0cd..6c230c3 100644 (file)
--- a/releases/fraser/joid.yaml
+++ b/releases/fraser/joid.yaml
@@ -1,9 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 project: joid
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      joid: 266a4fd08bef19fca930cbbb1d45f5639b87d3c0
+
 branches:
   - name: stable/fraser
     location:
       joid: f1b6b2867e4e907cb84ea4670ad32f36bddcbf6c
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/joid/docs/release/release-notes/index.html

diff --git a/releases/fraser/nfvbench.yaml b/releases/fraser/nfvbench.yaml
index e573a8b..9df1642 100644 (file)
--- a/releases/fraser/nfvbench.yaml
+++ b/releases/fraser/nfvbench.yaml
@@ -3,7 +3,14 @@ project: nfvbench
 project-type: tools
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      nfvbench: c8402089ad8686a16ad08ce6c6e16a14c3144d64
+
 branches:
   - name: stable/fraser
     location:
       nfvbench: 34c00544f7f7dbfa49bbdcd83eca2936b60826c7
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/nfvbench/docs/release/release-notes/release-notes.html

diff --git a/releases/fraser/parser.yaml b/releases/fraser/parser.yaml
index a592945..786d1b3 100644 (file)
--- a/releases/fraser/parser.yaml
+++ b/releases/fraser/parser.yaml
@@ -3,7 +3,15 @@ project: parser
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      parser: 1f8a48db426982b26237188881cb4e5bd0011d35
+
 branches:
   - name: stable/fraser
     location:
       parser: cabfeecb3259c5e22488756d91b6f72d27c4c18a
+
+release-notes:
+  http://docs.opnfv.org/en/stable-fraser/submodules/parser/docs/release/release-notes/release-notes.html

diff --git a/releases/fraser/sdnvpn.yaml b/releases/fraser/sdnvpn.yaml
index b0a3906..a4ebe84 100644 (file)
--- a/releases/fraser/sdnvpn.yaml
+++ b/releases/fraser/sdnvpn.yaml
@@ -7,3 +7,5 @@ branches:
   - name: stable/fraser
     location:
       sdnvpn: cc10bd492affb033b68d3b8f4cb1d8c9d554f995
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/sdnvpn/docs/release/release-notes/

diff --git a/releases/fraser/yardstick.yaml b/releases/fraser/yardstick.yaml
index 53bcfa6..1cb64bd 100644 (file)
--- a/releases/fraser/yardstick.yaml
+++ b/releases/fraser/yardstick.yaml
@@ -7,3 +7,5 @@ branches:
   - name: stable/fraser
     location:
       yardstick: f19016b39b828f648a66adc305cce17f5146e922
+
+release-notes: http://docs.opnfv.org/en/stable-fraser/submodules/yardstick/docs/release/release-notes/release-notes.html