Merge "Tag SDNVPN for Fraser 6.0"

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index f74b107..a5148cd 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -323,9 +323,9 @@ docker exec $container_id ${run_cmd}
 sudo cp -r ${DOVETAIL_HOME}/results ./
 # To make sure the file owner is the current user, for the copied results files in the above line
 # if not, there will be error when next time to wipe workspace
-# CURRENT_USER=${SUDO_USER:-$USER}
-# PRIMARY_GROUP=$(id -gn $CURRENT_USER)
-# sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
+CURRENT_USER=${SUDO_USER:-$USER}
+PRIMARY_GROUP=$(id -gn $CURRENT_USER)
+sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
 
 #remove useless files to save disk space
 sudo rm -rf ./results/workspace

diff --git a/releases/fraser/apex.yaml b/releases/fraser/apex.yaml
index bbbb2ac..c097d06 100644 (file)
--- a/releases/fraser/apex.yaml
+++ b/releases/fraser/apex.yaml
@@ -12,6 +12,20 @@ project-type: installer
 release-model: stable
 upstream: https://wiki.openstack.org/wiki/TripleO
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      apex: 283bb98ae05b77979f00716d3c9cd3fff6af3651
+  - version: opnfv-6.0.0
+    location:
+      apex-tripleo-heat-templates: 7f1cc97bcd6f267b11a251de3204edf0e8ec79c0
+  - version: opnfv-6.0.0
+    location:
+      apex-puppet-tripleo: bebd15efe40498c272577c563bc113ec3849dcc6
+  - version: opnfv-6.0.0
+    location:
+      apex-os-net-config: e09d110d7b58d26424c28a128cdfd8c766636461
+
 branches:
   - name: stable/fraser
     location:

diff --git a/releases/fraser/availability.yaml b/releases/fraser/availability.yaml
index 1b35af7..91163b5 100644 (file)
--- a/releases/fraser/availability.yaml
+++ b/releases/fraser/availability.yaml
@@ -3,6 +3,11 @@ project: availability
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      availability: c1ee3631b59009ff61450808e2bd33fe1d4b17f2
+
 branches:
   - name: stable/fraser
     location:

diff --git a/releases/fraser/barometer.yaml b/releases/fraser/barometer.yaml
index 1ff9085..4ad1e9d 100644 (file)
--- a/releases/fraser/barometer.yaml
+++ b/releases/fraser/barometer.yaml
@@ -3,6 +3,11 @@ project: barometer
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      barometer: 70a568ed8eed6f1a336f1fbe9bbc6900422e0c11
+
 branches:
   - name: stable/fraser
     location:

diff --git a/releases/fraser/clover.yaml b/releases/fraser/clover.yaml
index cb62737..c731d2a 100644 (file)
--- a/releases/fraser/clover.yaml
+++ b/releases/fraser/clover.yaml
@@ -7,6 +7,9 @@ releases:
   - version: opnfv-6.0.0
     location:
       clover: aae68d3d9dbb8baa3cadef134e6e045ad79f1f57
+  - version: opnfv-6.0.1
+    location:
+      clover: be5f20bbe91f1ae3138a1e338eea5b45e89bda82
 
 branches:
   - name: stable/fraser

diff --git a/releases/fraser/container4nfv.yaml b/releases/fraser/container4nfv.yaml
index 3e1b749..ed42ff0 100644 (file)
--- a/releases/fraser/container4nfv.yaml
+++ b/releases/fraser/container4nfv.yaml
@@ -3,6 +3,11 @@ project: container4nfv
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      container4nfv: 38d0ffe507a137167ffdbac860de5c1a738e81a8
+
 branches:
   - name: stable/fraser
     location:

diff --git a/releases/fraser/opnfvdocs.yaml b/releases/fraser/opnfvdocs.yaml
index da4835c..6e22328 100644 (file)
--- a/releases/fraser/opnfvdocs.yaml
+++ b/releases/fraser/opnfvdocs.yaml
@@ -3,6 +3,11 @@ project: opnfvdocs
 project-type: infra
 release-model: stable
 
+releases:
+  - version: opnfv-6.0.0
+    location:
+      opnfvdocs: 49538d56771c45d8d437ab00abaa1b52f97ac931
+
 branches:
   - name: stable/fraser
     location:

diff --git a/releases/fraser/parser.yaml b/releases/fraser/parser.yaml
index 786d1b3..ddcaa8f 100644 (file)
--- a/releases/fraser/parser.yaml
+++ b/releases/fraser/parser.yaml
@@ -5,6 +5,9 @@ release-model: stable
 
 releases:
   - version: opnfv-6.0.0
+    location:
+      parser: 320ca9e335797f2081f253df60a860e72b6cc9fb
+  - version: opnfv-6.0.1
     location:
       parser: 1f8a48db426982b26237188881cb4e5bd0011d35
 

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