Merge "GIT Tagging: Vswitchperf."

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 99363d0..8129ef0 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -473,12 +473,8 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_compute-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-refstack_object-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_platform-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run'

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index fbfa051..c3a9660 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -25,7 +25,7 @@
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'lf-build1'
+          default: 'lf-build2'
           description: 'Slave label on Jenkins'
           all-nodes: false
           node-eligibility: 'ignore-offline'

diff --git a/jjb/opnfvdocs/opnfvdocs.yaml b/jjb/opnfvdocs/opnfvdocs.yaml
index fe5d149..22d67d6 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yaml
+++ b/jjb/opnfvdocs/opnfvdocs.yaml
@@ -39,7 +39,7 @@
           name: GIT_CLONE_BASE
           default: ssh://gerrit.opnfv.org:29418
           description: "Used for overriding the GIT URL coming from parameters macro."
-      - 'opnfv-build-centos-defaults'
+      - 'opnfv-build-defaults'
 
     scm:
       - git-scm-gerrit
@@ -90,7 +90,7 @@
           default: '$GS_BASE{gs-pathname}'
           description: "Directory where the build artifact will be located upon\
             \ the completion of the build."
-      - 'opnfv-build-centos-defaults'
+      - 'opnfv-build-defaults'
 
     scm:
       - git-scm

diff --git a/jjb/releng/opnfv-lint.yaml b/jjb/releng/opnfv-lint.yaml
index 6483e32..dcd262a 100644 (file)
--- a/jjb/releng/opnfv-lint.yaml
+++ b/jjb/releng/opnfv-lint.yaml
@@ -47,6 +47,7 @@
           description: Slaves to execute yamllint
           default-slaves:
             - lf-build1
+            - lf-build2
           allowed-multiselect: true
           ignore-offline-nodes: true
 
@@ -96,9 +97,10 @@
           branch: '{branch}'
       - node:
           name: SLAVE_NAME
-          description: Slaves to execute yamllint
+          description: Slaves to execute pylint
           default-slaves:
             - lf-build1
+            - lf-build2
           allowed-multiselect: true
           ignore-offline-nodes: true
 
@@ -149,6 +151,7 @@
           description: Slaves to execute yamllint
           default-slaves:
             - lf-build1
+            - lf-build2
           allowed-multiselect: true
           ignore-offline-nodes: true
 

diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index 3dd5ce4..f85606f 100644 (file)
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -58,7 +58,7 @@
           name: SLAVE_NAME
           description: 'script lives on master node'
           default-slaves:
-            - lf-build1
+            - lf-build2
           allowed-multiselect: false
           ignore-offline-nodes: true
       - project-parameter:

diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index b72e38f..42a4d29 100644 (file)
--- a/jjb/releng/releng-release-jobs.yaml
+++ b/jjb/releng/releng-release-jobs.yaml
@@ -81,9 +81,10 @@
     parameters:
       - node:
           name: SLAVE_NAME
-          description: 'Only run merge job on build1'
+          description: 'Only run merge job on build1 or 2'
           default-slaves:
             - lf-build1
+            - lf-build2
           allowed-multiselect: false
           ignore-offline-nodes: true
       - stream-parameter:

diff --git a/releases/jerma/airship.yaml b/releases/jerma/airship.yaml
index 9b15fe5..22bb2fd 100644 (file)
--- a/releases/jerma/airship.yaml
+++ b/releases/jerma/airship.yaml
@@ -11,7 +11,14 @@ project: airship
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-10.0.0
+    location:
+      airship: a9ef2c8eb110daa3a395f7cb118bc5d26c5fca69
+
 branches:
   - name: stable/jerma
     location:
       airship: 4b2c638c2495be08953c1687ddbe689927d6cd8f
+
+release-notes: http://docs.opnfv.org/en/stable-jerma/submodules/airship/docs/release/release-notes/release-notes.html

diff --git a/releases/jerma/barometer.yaml b/releases/jerma/barometer.yaml
index 929d312..742d0a2 100644 (file)
--- a/releases/jerma/barometer.yaml
+++ b/releases/jerma/barometer.yaml
@@ -11,6 +11,10 @@ project: barometer
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-10.0.0
+    location:
+      barometer: 968f66fc2837744dfe8db69d2314cef3f0cb0800
 branches:
   - name: stable/jerma
     location:

diff --git a/releases/jerma/cirv.yaml b/releases/jerma/cirv.yaml
new file mode 100644 (file)
index 0000000..c16fbea
--- /dev/null
+++ b/releases/jerma/cirv.yaml
@@ -0,0 +1,15 @@
+---
+project: cirv
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/jerma
+    location:
+      cirv: f38765a83c1ba03b5619c1c66ed7bf1a2b6b00be
+  - name: stable/jerma
+    location:
+      cirv-hdv: 2d145d4f1fd231def2c9d52a71267031b938c0ac
+  - name: stable/jerma
+    location:
+      cirv-sdv: d1cc451f841f995028d57677e897a39229a065a2