Auto-generated patches to resolve prettier / yamllint

This is an auto-generated patch to handle prettier and yamllint rules.
Please refer to the next patch that handles adding the prettier linter
for the code behind this. Also update the .yamllint rules in
preparation for prettier inclusion.

Both patches should be merged together.

Issue: RELENG-152
Change-Id: Icbc11e7ee634c3e07941afe2b0d754f167e5c80c
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

diff --git a/.yamllint b/.yamllint
index fe0c97dcbc8087df98101209dd43688af70570c9..74bbf1a303d0bdaddfa9a68b0154a1431547fd2f 100644 (file)
--- a/.yamllint
+++ b/.yamllint
@@ -2,6 +2,8 @@
 extends: default
 
 rules:
 extends: default
 
 rules:

+  braces:
+    max-spaces-inside: 1

   empty-lines:
     max-end: 1
   line-length:
   empty-lines:
     max-end: 1
   line-length:

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 375a230f8c1e7e314ada3fff51d3f3dfb4fd5cc1..b193a112d09b71f7ef2440c9e9f73091869287f9 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -6,34 +6,34 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'aaa'
+    project: "aaa"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'authn'
+    functionality: "authn"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf'
+    install-features: "odl-restconf"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

 
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0
 
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index 7ef56316903eda1e80d501b1512732a3e3bcd6a3..6a8d125a7542fa9cd954838a47e0fb3778a4e263 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -4,40 +4,40 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'aaa'
+    project: "aaa"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
+    os-branch: "queens"

 
     feature:
       - authn:
           csit-list: >
 
     feature:
       - authn:
           csit-list: >

-              aaa-csit-1node-authn-all-{stream}
+            aaa-csit-1node-authn-all-{stream}

 
       - keystone:
           csit-list: >
 
       - keystone:
           csit-list: >

-              aaa-csit-1node-keystone-all-{stream}
+            aaa-csit-1node-keystone-all-{stream}

 
       - netvirt:
           csit-list: >
 
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 53486d225cfd3d3af637323640a749a2d0015296..e4bd2025b298c69c05fdfeb603275b882ee10963 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -2,8 +2,8 @@
 - project:
     name: aaa-silicon
     jobs:
 - project:
     name: aaa-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/


@@ -12,14 +12,14 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    project: "aaa"
+    project-name: "aaa"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "aaa-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33


@@ -27,8 +27,8 @@
 - project:
     name: aaa-aluminium
     jobs:
 - project:
     name: aaa-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/


@@ -37,14 +37,14 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    project: "aaa"
+    project-name: "aaa"
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "aaa-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33


@@ -52,8 +52,8 @@
 - project:
     name: aaa-magnesium
     jobs:
 - project:
     name: aaa-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/


@@ -62,14 +62,14 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    project: "aaa"
+    project-name: "aaa"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "aaa-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33


@@ -77,8 +77,8 @@
 - project:
     name: aaa-sodium
     jobs:
 - project:
     name: aaa-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/


@@ -87,13 +87,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/sodium'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    project: "aaa"
+    project-name: "aaa"
+    branch: "stable/sodium"
+    mvn-settings: "aaa-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33


@@ -106,16 +106,16 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "aaa"
+    project-name: "aaa"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "aaa-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: aaa-info
 
 - project:
     name: aaa-info


@@ -123,7 +123,7 @@
       - gerrit-info-yaml-verify
     project: aaa
     project-name: aaa
       - gerrit-info-yaml-verify
     project: aaa
     project-name: aaa

-    branch: 'master'
+    branch: "master"

     build-node: centos7-builder-2c-1g
 
 - project:
     build-node: centos7-builder-2c-1g
 
 - project:

diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml
index 2e58f2bc8daf77064e2d10e158c33f04344151f6..4f13c9dc16b9f36c7499610486656825edfd0401 100644 (file)
--- a/jjb/alt-datastores/alt-datastores.yaml
+++ b/jjb/alt-datastores/alt-datastores.yaml
@@ -2,7 +2,7 @@
 - project:
     name: alt-datastores-silicon
     jobs:
 - project:
     name: alt-datastores-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/
           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/


@@ -11,13 +11,13 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'alt-datastores'
-    project-name: 'alt-datastores'
-    branch: 'master'
-    mvn-settings: 'alt-datastores-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]'
+    project: "alt-datastores"
+    project-name: "alt-datastores"
+    branch: "master"
+    mvn-settings: "alt-datastores-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[alt-datastores] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -26,7 +26,7 @@
 - project:
     name: alt-datastores-aluminium
     jobs:
 - project:
     name: alt-datastores-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/
           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/


@@ -35,13 +35,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'alt-datastores'
-    project-name: 'alt-datastores'
-    branch: 'stable/aluminium'
-    mvn-settings: 'alt-datastores-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]'
+    project: "alt-datastores"
+    project-name: "alt-datastores"
+    branch: "stable/aluminium"
+    mvn-settings: "alt-datastores-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[alt-datastores] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -50,7 +50,7 @@
 - project:
     name: alt-datastores-magnesium
     jobs:
 - project:
     name: alt-datastores-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/
           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/


@@ -59,13 +59,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'alt-datastores'
-    project-name: 'alt-datastores'
-    branch: 'stable/magnesium'
-    mvn-settings: 'alt-datastores-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]'
+    project: "alt-datastores"
+    project-name: "alt-datastores"
+    branch: "stable/magnesium"
+    mvn-settings: "alt-datastores-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[alt-datastores] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -74,7 +74,7 @@
 - project:
     name: alt-datastores-sodium
     jobs:
 - project:
     name: alt-datastores-sodium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/
           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/


@@ -83,13 +83,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'alt-datastores'
-    project-name: 'alt-datastores'
-    branch: 'stable/sodium'
-    mvn-settings: 'alt-datastores-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]'
+    project: "alt-datastores"
+    project-name: "alt-datastores"
+    branch: "stable/sodium"
+    mvn-settings: "alt-datastores-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[alt-datastores] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -114,15 +114,15 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'alt-datastores'
-    project-name: 'alt-datastores'
-    branch: 'master'
-    mvn-settings: 'alt-datastores-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "alt-datastores"
+    project-name: "alt-datastores"
+    branch: "master"
+    mvn-settings: "alt-datastores-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: alt-datastores-info
 
 - project:
     name: alt-datastores-info

diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml
index dfc2124af672b66739acc0cfd721df1dc1cb3bd1..c4c8811836c38992225172419093575d3d4b70ec 100644 (file)
--- a/jjb/ansible/ansible.yaml
+++ b/jjb/ansible/ansible.yaml
@@ -2,29 +2,29 @@
 - project:
     name: ansible
     jobs:
 - project:
     name: ansible
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"

       - gerrit-tox-verify
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream:
       - silicon:
       - gerrit-tox-verify
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     project: ansible
     project-name: ansible
 
     project: ansible
     project-name: ansible

-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m'
+    mvn-settings: "netvirt-settings"
+    mvn-opts: "-Xmx2048m"

     build-node: centos7-builder-2c-2g
     build-timeout: 60
     build-node: centos7-builder-2c-2g
     build-timeout: 60

-    staging-profile-id: 'da5a90345bd62'
+    staging-profile-id: "da5a90345bd62"

 
 - project:
     name: ansible-info
 
 - project:
     name: ansible-info

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index afb8f95631913bc5b61bb1692ab20fc198d79725..006b92debb4588eaab82b3c8efd01849b9dae329 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -6,13 +6,13 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'archetypes-settings'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+    project: "archetypes"
+    project-name: "archetypes"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "archetypes-settings"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[archetypes] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d


@@ -24,13 +24,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'archetypes-settings'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+    project: "archetypes"
+    project-name: "archetypes"
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "archetypes-settings"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[archetypes] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d


@@ -42,13 +42,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'archetypes-settings'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+    project: "archetypes"
+    project-name: "archetypes"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "archetypes-settings"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[archetypes] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d


@@ -60,12 +60,12 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'stable/sodium'
-    mvn-settings: 'archetypes-settings'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+    project: "archetypes"
+    project-name: "archetypes"
+    branch: "stable/sodium"
+    mvn-settings: "archetypes-settings"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[archetypes] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d


@@ -75,15 +75,15 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'archetypes-settings'
+    project: "archetypes"
+    project-name: "archetypes"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "archetypes-settings"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: archetypes-info
 
 - project:
     name: archetypes-info

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index a1ab67240d25d3d05c23d53144427b6fb6de22b0..3a3d55bbbe39cc441c9cd3324efb16d59f68559b 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -5,7 +5,7 @@
     parameters:
       - string:
           name: RELEASE_TAG
     parameters:
       - string:
           name: RELEASE_TAG

-          default: '{release-tag}'
+          default: "{release-tag}"

           description: "The Release train tag to use eg. Beryllium-SR1"
 
 - wrapper:
           description: "The Release train tag to use eg. Beryllium-SR1"
 
 - wrapper:


@@ -58,19 +58,19 @@
     name: autorelease-maven-sources
     builders:
       - maven-target:
     name: autorelease-maven-sources
     builders:
       - maven-target:

-          maven-version: '{maven-version}'
-          pom: 'pom.xml'
+          maven-version: "{maven-version}"
+          pom: "pom.xml"

           goals: |
           goals: |

-              dependency:sources
-              --quiet
-              -DoutputFile=$WORKSPACE/sources.log
-              -DappendOutput
-              {opendaylight-infra-mvn-opts}
+            dependency:sources
+            --quiet
+            -DoutputFile=$WORKSPACE/sources.log
+            -DappendOutput
+            {opendaylight-infra-mvn-opts}

           java-opts:
           java-opts:

-            - '-Xmx4096m'
-          settings: '{settings}'
+            - "-Xmx4096m"
+          settings: "{settings}"

           settings-type: cfp
           settings-type: cfp

-          global-settings: '{global-settings}'
+          global-settings: "{global-settings}"

           global-settings-type: cfp
       - shell: |
           awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log
           global-settings-type: cfp
       - shell: |
           awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index c51bad97472d265f56d29863fc54068734ff8e99..3b49e34dea6bdf30d4833d288599eab8fac9637e 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,60 +3,60 @@
     name: autorelease-projects
     jobs:
       - autorelease-branch-cut
     name: autorelease-projects
     jobs:
       - autorelease-branch-cut

-      - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
+      - "autorelease-generate-release-notes-{stream}"
+      - "autorelease-release-{stream}-{mvn-version}-{java-version}":

           build-node: centos7-builder-4c-16g
           build-node: centos7-builder-4c-16g

-      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}'
+      - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"

 
     stream:
       - sodium:
 
     stream:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

           integration-test: sodium
           integration-test: sodium

-          cron: '@weekly'
+          cron: "@weekly"

 
     project: releng/autorelease
     project-name: autorelease
     build-node: centos7-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
 
     project: releng/autorelease
     project-name: autorelease
     build-node: centos7-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
     mvn-params: >
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
     mvn-params: >

-        -PrepoBuild
-        -P!karaf
-        -Pignore-lispflowmapping-integrationtest
-        -Dcheckstyle.skip=true
-        -Dskip.karaf.featureTest=true
-        -Dsft.heap.max=4g
+      -PrepoBuild
+      -P!karaf
+      -Pignore-lispflowmapping-integrationtest
+      -Dcheckstyle.skip=true
+      -Dskip.karaf.featureTest=true
+      -Dsft.heap.max=4g

     java-version: openjdk8
 
 - project:
     name: autorelease-projects-openjdk11
     jobs:
     java-version: openjdk8
 
 - project:
     name: autorelease-projects-openjdk11
     jobs:

-      - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
+      - "autorelease-generate-release-notes-{stream}"
+      - "autorelease-release-{stream}-{mvn-version}-{java-version}":

           build-node: centos7-builder-4c-16g
           build-node: centos7-builder-4c-16g

-      - 'autorelease-update-submodules-{stream}'
-      - 'autorelease-update-validate-jobs-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}'
+      - "autorelease-update-submodules-{stream}"
+      - "autorelease-update-validate-jobs-{stream}"
+      - "{project-name}-validate-autorelease-{stream}"
+      - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"

       - gerrit-tox-verify
 
     stream:
       - silicon:
       - gerrit-tox-verify
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

           integration-test: silicon
       - aluminium:
           integration-test: silicon
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

           integration-test: aluminium
       - magnesium:
           integration-test: aluminium
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

           integration-test: magnesium
 
     project: releng/autorelease
           integration-test: magnesium
 
     project: releng/autorelease


@@ -64,22 +64,22 @@
     build-node: centos7-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
     build-node: centos7-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
     mvn-params: >
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
     mvn-params: >

-        -PrepoBuild
-        -P!karaf
-        -Pignore-lispflowmapping-integrationtest
-        -Dcheckstyle.skip=true
-        -Dskip.karaf.featureTest=true
-        -Dsft.heap.max=4g
-    java-version: 'openjdk11'
+      -PrepoBuild
+      -P!karaf
+      -Pignore-lispflowmapping-integrationtest
+      -Dcheckstyle.skip=true
+      -Dskip.karaf.featureTest=true
+      -Dsft.heap.max=4g
+    java-version: "openjdk11"

 
 - project:
     name: autorelease-info
 
 - project:
     name: autorelease-info

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index d607c9f0527de29117ff09cb78d53d8b976e36b9..66caa8b625aa30a392cc2fa76bed98f9c86e7e0d 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -19,23 +19,23 @@
           project: releng/autorelease
           branch: master
           stream: master
           project: releng/autorelease
           branch: master
           stream: master

-          lftools-version: '{lftools-version}'
+          lftools-version: "{lftools-version}"

       - string:
           name: RELEASE
           description: |
       - string:
           name: RELEASE
           description: |

-              Release name to branch cut.
-              Eg. Lithium, Beryllium, Boron, Carbon...
+            Release name to branch cut.
+            Eg. Lithium, Beryllium, Boron, Carbon...

       - bool:
           name: DRY_RUN
           default: true
           description: |
       - bool:
           name: DRY_RUN
           default: true
           description: |

-              If DRY_RUN is enabled modifications are not published to Gerrit.
+            If DRY_RUN is enabled modifications are not published to Gerrit.

 
     scm:
       - lf-infra-gerrit-scm:
 
     scm:
       - lf-infra-gerrit-scm:

-          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          git-url: "$GIT_URL/$GERRIT_PROJECT"

           branch: master
           branch: master

-          refspec: 'refs/heads/master'
+          refspec: "refs/heads/master"

           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true


@@ -54,31 +54,31 @@
       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: 'autorelease-release-{stream}-{mvn-version}-{java-version}'
+    name: "autorelease-release-{stream}-{mvn-version}-{java-version}"

 
     ######################
     # Default parameters #
     ######################
 
 
     ######################
     # Default parameters #
     ######################
 

-    build-node: '{build-node}'
-    cron: 'H 0 * * *'
-    java-version: '{java-version}'
+    build-node: "{build-node}"
+    cron: "H 0 * * *"
+    java-version: "{java-version}"

     mvn-global-settings: global-settings
     mvn-goals: clean deploy
     mvn-global-settings: global-settings
     mvn-goals: clean deploy

-    mvn-opts: '-Xmx8g -Dmaven.compile.fork=true'
-    mvn-params: ''
+    mvn-opts: "-Xmx8g -Dmaven.compile.fork=true"
+    mvn-params: ""

     mvn-settings: autorelease-settings
     mvn-version: mvn35
     sign-artifacts: true
     mvn-settings: autorelease-settings
     mvn-version: mvn35
     sign-artifacts: true

-    disable-job: 'false'
+    disable-job: "false"

 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle
 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle

-    node: '{build-node}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    disabled: "{disable-job}"

 
     properties:
       - lf-infra-properties:
 
     properties:
       - lf-infra-properties:


@@ -86,34 +86,34 @@
 
     parameters:
       - lf-infra-parameters:
 
     parameters:
       - lf-infra-parameters:

-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
-          lftools-version: '{lftools-version}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
+          lftools-version: "{lftools-version}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - autorelease-release-tag:
       - autorelease-release-tag:

-          release-tag: '{stream}'
+          release-tag: "{stream}"

       - string:
           name: ARCHIVE_ARTIFACTS
       - string:
           name: ARCHIVE_ARTIFACTS

-          default: '{archive-artifacts}'
+          default: "{archive-artifacts}"

           description: Artifacts to archive to the logs server.
       - string:
           name: STAGING_PROFILE_ID
           description: Artifacts to archive to the logs server.
       - string:
           name: STAGING_PROFILE_ID

-          default: '{staging-profile-id}'
+          default: "{staging-profile-id}"

           description: Nexus staging profile ID.
 
     scm:
       - git:
           description: Nexus staging profile ID.
 
     scm:
       - git:

-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: '$GERRIT_REFSPEC'
+          credentials-id: "opendaylight-jenkins-ssh"
+          url: "$GIT_BASE"
+          refspec: "$GERRIT_REFSPEC"

           branches:
           branches:

-            - '$GERRIT_BRANCH'
+            - "$GERRIT_BRANCH"

           choosing-strategy: default
           skip-tag: true
           submodule:
           choosing-strategy: default
           skip-tag: true
           submodule:


@@ -122,51 +122,51 @@
 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '900'
+          build-timeout: "900"

 
     triggers:
 
     triggers:

-      - timed: '{cron}'
+      - timed: "{cron}"

 
     builders:
       - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
       - lf-maven-install:
 
     builders:
       - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
       - lf-maven-install:

-          mvn-version: '{mvn-version}'
+          mvn-version: "{mvn-version}"

       - wipe-local-maven-repo
       - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
       - lf-provide-maven-settings:
       - wipe-local-maven-repo
       - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
       - lf-provide-maven-settings:

-          global-settings-file: '{mvn-global-settings}'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"

       - autorelease-generate-release-patches
       - autorelease-generate-artifact-versions
       - lf-update-java-alternatives:
       - autorelease-generate-release-patches
       - autorelease-generate-artifact-versions
       - lf-update-java-alternatives:

-          java-version: '{java-version}'
+          java-version: "{java-version}"

       - autorelease-distribute-taglist
       - distribute-build-url:
       - autorelease-distribute-taglist
       - distribute-build-url:

-          path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
+          path: "integration/distribution/$KARAF_ARTIFACT/src/main/assembly"

       # In a perfect world projects should be releasing separately and we consume them
       # via a project that pulls the release bits from each project from Nexus.
       # Keep the patches compatible with that ideal, but apply an edit
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - lf-maven-build:
       # In a perfect world projects should be releasing separately and we consume them
       # via a project that pulls the release bits from each project from Nexus.
       # Keep the patches compatible with that ideal, but apply an edit
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - lf-maven-build:

-          mvn-goals: '{mvn-goals}'
+          mvn-goals: "{mvn-goals}"

       - lf-sigul-sign-dir:
       - lf-sigul-sign-dir:

-          sign-artifacts: '{sign-artifacts}'
-          sign-dir: '$WORKSPACE/m2repo'
+          sign-artifacts: "{sign-artifacts}"
+          sign-dir: "$WORKSPACE/m2repo"

           sign-mode: serial
       - lf-maven-stage:
           sign-mode: serial
       - lf-maven-stage:

-          mvn-global-settings: '{mvn-global-settings}'
-          mvn-settings: '{mvn-settings}'
-          mvn-staging-id: '{mvn-staging-id}'
+          mvn-global-settings: "{mvn-global-settings}"
+          mvn-settings: "{mvn-settings}"
+          mvn-staging-id: "{mvn-staging-id}"

       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:

-          opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
-          maven-version: '{mvn-version}'
-          settings: '{mvn-settings}'
-          global-settings: '{mvn-global-settings}'
+          opendaylight-infra-mvn-opts: "{opendaylight-infra-mvn-opts}"
+          maven-version: "{mvn-version}"
+          settings: "{mvn-settings}"
+          global-settings: "{mvn-global-settings}"

       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_


@@ -174,19 +174,19 @@
     publishers:
       - opendaylight-infra-notify-status
       - trigger-parameterized-builds:
     publishers:
       - opendaylight-infra-notify-status
       - trigger-parameterized-builds:

-          - project: 'integration-distribution-test-{integration-test}'
+          - project: "integration-distribution-test-{integration-test}"

             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true
             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true

-          - project: 'integration-distribution-test-{integration-test}'
+          - project: "integration-distribution-test-{integration-test}"

             condition: FAILED
             trigger-with-no-params: true
             condition: FAILED
             trigger-with-no-params: true

-          - project: 'packaging-build-rpm-{stream}'
+          - project: "packaging-build-rpm-{stream}"

             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
             property-file: variables.jenkins-trigger
             fail-on-missing: true
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
             property-file: variables.jenkins-trigger
             fail-on-missing: true

-          - project: 'packaging-build-deb-{stream}'
+          - project: "packaging-build-deb-{stream}"

             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
             property-file: variables.jenkins-trigger
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
             property-file: variables.jenkins-trigger


@@ -203,14 +203,14 @@
       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: 'autorelease-update-submodules-{stream}'
+    name: "autorelease-update-submodules-{stream}"

 
     ######################
     # Default parameters #
     ######################
 
 
     ######################
     # Default parameters #
     ######################
 

-    cron: 'H 0 * * *'
-    disable-job: 'false'
+    cron: "H 0 * * *"
+    disable-job: "false"

 
     #####################
     # Job configuration #
 
     #####################
     # Job configuration #


@@ -218,7 +218,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-2g
 
     project-type: freestyle
     node: centos7-builder-2c-2g

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - lf-infra-properties:
 
     properties:
       - lf-infra-properties:


@@ -227,16 +227,16 @@
     parameters:
       - lf-infra-parameters:
           project: releng/autorelease
     parameters:
       - lf-infra-parameters:
           project: releng/autorelease

-          branch: '{branch}'
-          stream: '{stream}'
-          refspec: 'refs/heads/{branch}'
-          lftools-version: '{lftools-version}'
+          branch: "{branch}"
+          stream: "{stream}"
+          refspec: "refs/heads/{branch}"
+          lftools-version: "{lftools-version}"

 
     scm:
       - lf-infra-gerrit-scm:
 
     scm:
       - lf-infra-gerrit-scm:

-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
+          git-url: "$GIT_URL/$GERRIT_PROJECT"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"

           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true


@@ -249,7 +249,7 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     triggers:
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     triggers:

-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"

 
     builders:
       - lf-infra-pre-build
 
     builders:
       - lf-infra-pre-build


@@ -259,12 +259,12 @@
           git submodule update --remote
           git add .
       - lf-infra-push-gerrit-patch:
           git submodule update --remote
           git add .
       - lf-infra-push-gerrit-patch:

-          project: '{project}'
-          gerrit-user: 'jenkins-$SILO'
-          gerrit-host: 'git.opendaylight.org'
-          gerrit-topic: 'autorelease-update-submodules'
-          gerrit-commit-message: 'Update submodules to latest HEAD of branch'
-          reviewers-email: ''
+          project: "{project}"
+          gerrit-user: "jenkins-$SILO"
+          gerrit-host: "git.opendaylight.org"
+          gerrit-topic: "autorelease-update-submodules"
+          gerrit-commit-message: "Update submodules to latest HEAD of branch"
+          reviewers-email: ""

 
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish


@@ -276,8 +276,8 @@
     # Default parameters #
     ######################
 
     # Default parameters #
     ######################
 

-    cron: '@weekly'
-    disable-job: 'false'
+    cron: "@weekly"
+    disable-job: "false"

 
     #####################
     # Job configuration #
 
     #####################
     # Job configuration #


@@ -285,7 +285,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-1g
 
     project-type: freestyle
     node: centos7-builder-2c-1g

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - lf-infra-properties:
 
     properties:
       - lf-infra-properties:


@@ -294,15 +294,15 @@
     parameters:
       - lf-infra-parameters:
           project: releng/builder
     parameters:
       - lf-infra-parameters:
           project: releng/builder

-          branch: '{branch}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
+          branch: "{branch}"
+          stream: "{stream}"
+          lftools-version: "{lftools-version}"

 
     scm:
       - lf-infra-gerrit-scm:
 
     scm:
       - lf-infra-gerrit-scm:

-          git-url: '$GIT_URL/releng/builder'
+          git-url: "$GIT_URL/releng/builder"

           branch: master
           branch: master

-          refspec: 'refs/heads/master'
+          refspec: "refs/heads/master"

           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true


@@ -310,19 +310,19 @@
           choosing-strategy: default
 
     triggers:
           choosing-strategy: default
 
     triggers:

-      - timed: '{cron}'
+      - timed: "{cron}"

       - gerrit:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
                 comment-contains-value: remerge$
           projects:
             - project-compare-type: ANT
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
                 comment-contains-value: remerge$
           projects:
             - project-compare-type: ANT

-              project-pattern: '{project}'
+              project-pattern: "{project}"

               branches:
                 - branch-compare-type: ANT
               branches:
                 - branch-compare-type: ANT

-                  branch-pattern: '**/{branch}'
+                  branch-pattern: "**/{branch}"

               file-paths:
                 - compare-type: ANT
                   pattern: pom.xml
               file-paths:
                 - compare-type: ANT
                   pattern: pom.xml


@@ -337,12 +337,12 @@
       - autorelease-update-project-views
       - autorelease-update-validate-projects
       - lf-infra-push-gerrit-patch:
       - autorelease-update-project-views
       - autorelease-update-validate-projects
       - lf-infra-push-gerrit-patch:

-          project: '{project}'
-          gerrit-user: 'jenkins-$SILO'
-          gerrit-host: 'git.opendaylight.org'
-          gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
-          gerrit-commit-message: 'Update validate-ar jobs for {stream}'
-          reviewers-email: 'jenkins-releng@opendaylight.org'
+          project: "{project}"
+          gerrit-user: "jenkins-$SILO"
+          gerrit-host: "git.opendaylight.org"
+          gerrit-topic: "autorelease-update-validate-jobs-{stream}"
+          gerrit-commit-message: "Update validate-ar jobs for {stream}"
+          reviewers-email: "jenkins-releng@opendaylight.org"

 
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish


@@ -357,15 +357,15 @@
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35

-    disable-job: 'false'
+    disable-job: "false"

 
     #####################
     # Job configuration #
     #####################
 
     project-type: freestyle
 
     #####################
     # Job configuration #
     #####################
 
     project-type: freestyle

-    node: '{build-node}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:


@@ -374,38 +374,38 @@
     parameters:
       - lf-infra-parameters:
           project: releng/autorelease
     parameters:
       - lf-infra-parameters:
           project: releng/autorelease

-          branch: '{branch}'
-          stream: '{stream}'
-          refspec: 'refs/heads/{branch}'
-          lftools-version: '{lftools-version}'
+          branch: "{branch}"
+          stream: "{stream}"
+          refspec: "refs/heads/{branch}"
+          lftools-version: "{lftools-version}"

       - string:
           name: RELEASE_TAG
       - string:
           name: RELEASE_TAG

-          default: '{stream}'
+          default: "{stream}"

           description: |
           description: |

-              Release that is being version bumped.
-              Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2...
+            Release that is being version bumped.
+            Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2...

       - bool:
           name: BRANCH_CUT
           default: false
           description: |
       - bool:
           name: BRANCH_CUT
           default: false
           description: |

-              If BRANCH_CUT is enabled, perform version bump for branch cutting
-              workflow, else perform version bump for simultaneous release
-              workflow (detault).
+            If BRANCH_CUT is enabled, perform version bump for branch cutting
+            workflow, else perform version bump for simultaneous release
+            workflow (detault).

       - bool:
           name: DRY_RUN
           default: true
           description: |
       - bool:
           name: DRY_RUN
           default: true
           description: |

-              If DRY_RUN is enabled modifications are not published to Gerrit
-              and artifacts are not pushed to Nexus. Instead the build will be
-              performed using the goals "clean install".
+            If DRY_RUN is enabled modifications are not published to Gerrit
+            and artifacts are not pushed to Nexus. Instead the build will be
+            performed using the goals "clean install".

       - maven-exec:
       - maven-exec:

-          maven-version: '{mvn-version}'
+          maven-version: "{mvn-version}"

 
     scm:
       - lf-infra-gerrit-scm:
 
     scm:
       - lf-infra-gerrit-scm:

-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
+          git-url: "$GIT_URL/$GERRIT_PROJECT"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"

           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true


@@ -423,10 +423,10 @@
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - lf-maven-install:
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - lf-maven-install:

-          mvn-version: '{mvn-version}'
+          mvn-version: "{mvn-version}"

       - lf-provide-maven-settings:
       - lf-provide-maven-settings:

-          global-settings-file: '{mvn-global-settings}'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"

       - shell: !include-raw-escape:
           - version-bump.sh
 
       - shell: !include-raw-escape:
           - version-bump.sh
 


@@ -434,12 +434,12 @@
       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: 'autorelease-generate-release-notes-{stream}'
+    name: "autorelease-generate-release-notes-{stream}"

 
     ######################
     # Default parameters #
     ######################
 
     ######################
     # Default parameters #
     ######################

-    disable-job: 'false'
+    disable-job: "false"

 
     gerrit_merge_triggers:
       - comment-added-contains-event:
 
     gerrit_merge_triggers:
       - comment-added-contains-event:


@@ -451,7 +451,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-8g
 
     project-type: freestyle
     node: centos7-builder-2c-8g

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - lf-infra-properties:
 
     properties:
       - lf-infra-properties:


@@ -459,20 +459,20 @@
 
     parameters:
       - lf-infra-parameters:
 
     parameters:
       - lf-infra-parameters:

-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
+          lftools-version: "{lftools-version}"

       - string:
           name: RELEASE
           description: |
       - string:
           name: RELEASE
           description: |

-              Release to generate release notes for.
-              Eg. Sodium-SR1, Magnesium-SR2...
+            Release to generate release notes for.
+            Eg. Sodium-SR1, Magnesium-SR2...

     scm:
       - lf-infra-gerrit-scm:
     scm:
       - lf-infra-gerrit-scm:

-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          branch: '$GERRIT_BRANCH'
-          refspec: '$GERRIT_REFSPEC'
+          git-url: "$GIT_URL/$GERRIT_PROJECT"
+          branch: "$GERRIT_BRANCH"
+          refspec: "$GERRIT_REFSPEC"

           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true


@@ -486,14 +486,14 @@
 
     triggers:
       - gerrit:
 
     triggers:
       - gerrit:

-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"

           projects:
             - project-compare-type: ANT
           projects:
             - project-compare-type: ANT

-              project-pattern: '{project}'
+              project-pattern: "{project}"

               branches:
                 - branch-compare-type: ANT
               branches:
                 - branch-compare-type: ANT

-                  branch-pattern: '**/{branch}'
+                  branch-pattern: "**/{branch}"

 
     builders:
       - lf-infra-pre-build
 
     builders:
       - lf-infra-pre-build


@@ -503,7 +503,7 @@
       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: '{project-name}-validate-autorelease-{stream}'
+    name: "{project-name}-validate-autorelease-{stream}"

 
     #####################
     # Default variables #
 
     #####################
     # Default variables #


@@ -513,7 +513,7 @@
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35

-    disable-job: 'false'
+    disable-job: "false"

 
     #####################
     # Job Configuration #
 
     #####################
     # Job Configuration #


@@ -524,8 +524,8 @@
     #       override the build node.
     node: centos7-builder-2c-8g
     concurrent: true
     #       override the build node.
     node: centos7-builder-2c-8g
     concurrent: true

-    jdk: '{java-version}'
-    disabled: '{disable-job}'
+    jdk: "{java-version}"
+    disabled: "{disable-job}"

 
     properties:
       - lf-infra-properties:
 
     properties:
       - lf-infra-properties:


@@ -533,24 +533,24 @@
 
     parameters:
       - lf-infra-parameters:
 
     parameters:
       - lf-infra-parameters:

-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
-          lftools-version: '{lftools-version}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
+          lftools-version: "{lftools-version}"

       - autorelease-release-tag:
           release-tag: validate
       - string:
           name: CLONE_URL
       - autorelease-release-tag:
           release-tag: validate
       - string:
           name: CLONE_URL

-          default: '{git-url}/releng/autorelease'
+          default: "{git-url}/releng/autorelease"

           description: "Autorelease clone URL"
 
     scm:
       - git:
           description: "Autorelease clone URL"
 
     scm:
       - git:

-          url: '$CLONE_URL'
-          credentials-id: 'opendaylight-jenkins-ssh'
-          refspec: ''
+          url: "$CLONE_URL"
+          credentials-id: "opendaylight-jenkins-ssh"
+          refspec: ""

           branches:
           branches:

-            - 'origin/{branch}'
+            - "origin/{branch}"

           skip-tag: true
           submodule:
             recursive: true
           skip-tag: true
           submodule:
             recursive: true


@@ -558,15 +558,15 @@
 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
       - gerrit-trigger-patch-submitted:
 
     triggers:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**/*.xml'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**/*.xml"
+          forbidden-files: ""

 
     builders:
       - lf-infra-pre-build
 
     builders:
       - lf-infra-pre-build


@@ -583,31 +583,31 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:

-          maven-version: '{mvn-version}'
+          maven-version: "{mvn-version}"

           pom: validate-pom.xml
           goals: |
           pom: validate-pom.xml
           goals: |

-              clean install dependency:tree
-              -T1.5C
-              -Pq
-              {opendaylight-infra-mvn-opts}
+            clean install dependency:tree
+            -T1.5C
+            -Pq
+            {opendaylight-infra-mvn-opts}

           java-opts:
           java-opts:

-            - '-Xmx8g'
-          settings: '{mvn-settings}'
+            - "-Xmx8g"
+          settings: "{mvn-settings}"

           settings-type: cfp
           settings-type: cfp

-          global-settings: '{mvn-global-settings}'
+          global-settings: "{mvn-global-settings}"

           global-settings-type: cfp
       - maven-target:
           global-settings-type: cfp
       - maven-target:

-          maven-version: '{mvn-version}'
+          maven-version: "{mvn-version}"

           pom: pom.xml
           goals: |
           pom: pom.xml
           goals: |

-              clean validate
-              -Pq
-              {opendaylight-infra-mvn-opts}
+            clean validate
+            -Pq
+            {opendaylight-infra-mvn-opts}

           java-opts:
           java-opts:

-            - '-Xmx8g -Dmaven.compile.fork=true'
-          settings: '{mvn-settings}'
+            - "-Xmx8g -Dmaven.compile.fork=true"
+          settings: "{mvn-settings}"

           settings-type: cfp
           settings-type: cfp

-          global-settings: '{mvn-global-settings}'
+          global-settings: "{mvn-global-settings}"

           global-settings-type: cfp
       - shell: |
           mkdir -p archives/
           global-settings-type: cfp
       - shell: |
           mkdir -p archives/


@@ -615,6 +615,6 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[autorelease] [{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[autorelease] [{project-name}]"

       - lf-infra-publish
       - lf-infra-publish

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 29a773b3d6c46bb61e4b1167d1ff551f3d8744f6..e62c810adabba977715f4f33ad903c2f7c8a4b0a 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -12,10 +12,10 @@
 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml
index 44dff335252e39050d4f652c3ae6702f5e70c3b7..faed8ebbc9c1c896a4753dcef9852bbd1eee4c17 100644 (file)
--- a/jjb/autorelease/validate-autorelease-aluminium.yaml
+++ b/jjb/autorelease/validate-autorelease-aluminium.yaml
@@ -3,7 +3,7 @@
 - project:
     name: autorelease-validate-aluminium
     jobs:
 - project:
     name: autorelease-validate-aluminium
     jobs:

-      - '{project-name}-validate-autorelease-{stream}'
+      - "{project-name}-validate-autorelease-{stream}"

     stream: aluminium
     branch: stable/aluminium
     project-name:
     stream: aluminium
     branch: stable/aluminium
     project-name:

diff --git a/jjb/autorelease/validate-autorelease-magnesium.yaml b/jjb/autorelease/validate-autorelease-magnesium.yaml
index cfed3ae595dd5a8d45e15a973fe708bc3949ae89..fa6e8bdd0511700e0654c15dfa8b294176c59b09 100644 (file)
--- a/jjb/autorelease/validate-autorelease-magnesium.yaml
+++ b/jjb/autorelease/validate-autorelease-magnesium.yaml
@@ -3,7 +3,7 @@
 - project:
     name: autorelease-validate-magnesium
     jobs:
 - project:
     name: autorelease-validate-magnesium
     jobs:

-      - '{project-name}-validate-autorelease-{stream}'
+      - "{project-name}-validate-autorelease-{stream}"

     stream: magnesium
     branch: stable/magnesium
     project-name:
     stream: magnesium
     branch: stable/magnesium
     project-name:

diff --git a/jjb/autorelease/validate-autorelease-silicon.yaml b/jjb/autorelease/validate-autorelease-silicon.yaml
index e96b3c6abed61b53d310769e6c93e345a981b032..a5fd4c387a91f98d25e1f4b090806e0df61336d1 100644 (file)
--- a/jjb/autorelease/validate-autorelease-silicon.yaml
+++ b/jjb/autorelease/validate-autorelease-silicon.yaml
@@ -3,7 +3,7 @@
 - project:
     name: autorelease-validate-silicon
     jobs:
 - project:
     name: autorelease-validate-silicon
     jobs:

-      - '{project-name}-validate-autorelease-{stream}'
+      - "{project-name}-validate-autorelease-{stream}"

     stream: silicon
     branch: master
     project-name:
     stream: silicon
     branch: master
     project-name:

diff --git a/jjb/autorelease/validate-autorelease-sodium.yaml b/jjb/autorelease/validate-autorelease-sodium.yaml
index 1e6652a3157c4b5cf86000a77e7aba8434834e35..eede8a2eeed4f4dfa08d69b339c1e2173c6f38d5 100644 (file)
--- a/jjb/autorelease/validate-autorelease-sodium.yaml
+++ b/jjb/autorelease/validate-autorelease-sodium.yaml
@@ -3,7 +3,7 @@
 - project:
     name: autorelease-validate-sodium
     jobs:
 - project:
     name: autorelease-validate-sodium
     jobs:

-      - '{project-name}-validate-autorelease-{stream}'
+      - "{project-name}-validate-autorelease-{stream}"

     stream: sodium
     branch: stable/sodium
     project-name:
     stream: sodium
     branch: stable/sodium
     project-name:

diff --git a/jjb/autorelease/view-autorelease-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml
index 6f7af118768698b7b662ff7eb25be1b1e4720de8..630ef689022fb7dd5f154bee41545f3e528f8f40 100644 (file)
--- a/jjb/autorelease/view-autorelease-aluminium.yaml
+++ b/jjb/autorelease/view-autorelease-aluminium.yaml
@@ -20,19 +20,19 @@
 
 - view:
     name: Merge-Aluminium
 
 - view:
     name: Merge-Aluminium

-    description: 'List of Aluminium Merge jobs for Autorelease'
+    description: "List of Aluminium Merge jobs for Autorelease"

     job-name:
     job-name:

-      - 'aaa-maven-merge-aluminium'
-      - 'bgpcep-maven-merge-aluminium'
-      - 'daexim-maven-merge-aluminium'
-      - 'genius-maven-merge-aluminium'
-      - 'integration/distribution-maven-merge-aluminium'
-      - 'jsonrpc-maven-merge-aluminium'
-      - 'lispflowmapping-maven-merge-aluminium'
-      - 'netconf-maven-merge-aluminium'
-      - 'netvirt-maven-merge-aluminium'
-      - 'neutron-maven-merge-aluminium'
-      - 'openflowplugin-maven-merge-aluminium'
-      - 'ovsdb-maven-merge-aluminium'
-      - 'serviceutils-maven-merge-aluminium'
+      - "aaa-maven-merge-aluminium"
+      - "bgpcep-maven-merge-aluminium"
+      - "daexim-maven-merge-aluminium"
+      - "genius-maven-merge-aluminium"
+      - "integration/distribution-maven-merge-aluminium"
+      - "jsonrpc-maven-merge-aluminium"
+      - "lispflowmapping-maven-merge-aluminium"
+      - "netconf-maven-merge-aluminium"
+      - "netvirt-maven-merge-aluminium"
+      - "neutron-maven-merge-aluminium"
+      - "openflowplugin-maven-merge-aluminium"
+      - "ovsdb-maven-merge-aluminium"
+      - "serviceutils-maven-merge-aluminium"

     <<: *releng_autorelease_view_common_aluminium
     <<: *releng_autorelease_view_common_aluminium

diff --git a/jjb/autorelease/view-autorelease-magnesium.yaml b/jjb/autorelease/view-autorelease-magnesium.yaml
index 9fa0634cfabc51ba81f61287bc1ea2748986312f..beb95f73a4c0fb48fb05176312c70e7450918674 100644 (file)
--- a/jjb/autorelease/view-autorelease-magnesium.yaml
+++ b/jjb/autorelease/view-autorelease-magnesium.yaml
@@ -20,21 +20,21 @@
 
 - view:
     name: Merge-Magnesium
 
 - view:
     name: Merge-Magnesium

-    description: 'List of Magnesium Merge jobs for Autorelease'
+    description: "List of Magnesium Merge jobs for Autorelease"

     job-name:
     job-name:

-      - 'aaa-merge-magnesium'
-      - 'bgpcep-merge-magnesium'
-      - 'controller-merge-magnesium'
-      - 'daexim-merge-magnesium'
-      - 'genius-merge-magnesium'
-      - 'infrautils-merge-magnesium'
-      - 'integration/distribution-merge-magnesium'
-      - 'jsonrpc-merge-magnesium'
-      - 'lispflowmapping-merge-magnesium'
-      - 'netconf-merge-magnesium'
-      - 'netvirt-merge-magnesium'
-      - 'neutron-merge-magnesium'
-      - 'openflowplugin-merge-magnesium'
-      - 'ovsdb-merge-magnesium'
-      - 'serviceutils-merge-magnesium'
+      - "aaa-merge-magnesium"
+      - "bgpcep-merge-magnesium"
+      - "controller-merge-magnesium"
+      - "daexim-merge-magnesium"
+      - "genius-merge-magnesium"
+      - "infrautils-merge-magnesium"
+      - "integration/distribution-merge-magnesium"
+      - "jsonrpc-merge-magnesium"
+      - "lispflowmapping-merge-magnesium"
+      - "netconf-merge-magnesium"
+      - "netvirt-merge-magnesium"
+      - "neutron-merge-magnesium"
+      - "openflowplugin-merge-magnesium"
+      - "ovsdb-merge-magnesium"
+      - "serviceutils-merge-magnesium"

     <<: *releng_autorelease_view_common_magnesium
     <<: *releng_autorelease_view_common_magnesium

diff --git a/jjb/autorelease/view-autorelease-silicon.yaml b/jjb/autorelease/view-autorelease-silicon.yaml
index 858c90f3996a20f6e4ba42fdc00473490f33cfe3..e6d9e0f8dfc241f50f31a1d020e3056b5066cacf 100644 (file)
--- a/jjb/autorelease/view-autorelease-silicon.yaml
+++ b/jjb/autorelease/view-autorelease-silicon.yaml
@@ -20,19 +20,19 @@
 
 - view:
     name: Merge-Silicon
 
 - view:
     name: Merge-Silicon

-    description: 'List of Silicon Merge jobs for Autorelease'
+    description: "List of Silicon Merge jobs for Autorelease"

     job-name:
     job-name:

-      - 'aaa-maven-merge-silicon'
-      - 'bgpcep-maven-merge-silicon'
-      - 'daexim-maven-merge-silicon'
-      - 'genius-maven-merge-silicon'
-      - 'integration/distribution-maven-merge-silicon'
-      - 'jsonrpc-maven-merge-silicon'
-      - 'lispflowmapping-maven-merge-silicon'
-      - 'netconf-maven-merge-silicon'
-      - 'netvirt-maven-merge-silicon'
-      - 'neutron-maven-merge-silicon'
-      - 'openflowplugin-maven-merge-silicon'
-      - 'ovsdb-maven-merge-silicon'
-      - 'serviceutils-maven-merge-silicon'
+      - "aaa-maven-merge-silicon"
+      - "bgpcep-maven-merge-silicon"
+      - "daexim-maven-merge-silicon"
+      - "genius-maven-merge-silicon"
+      - "integration/distribution-maven-merge-silicon"
+      - "jsonrpc-maven-merge-silicon"
+      - "lispflowmapping-maven-merge-silicon"
+      - "netconf-maven-merge-silicon"
+      - "netvirt-maven-merge-silicon"
+      - "neutron-maven-merge-silicon"
+      - "openflowplugin-maven-merge-silicon"
+      - "ovsdb-maven-merge-silicon"
+      - "serviceutils-maven-merge-silicon"

     <<: *releng_autorelease_view_common_silicon
     <<: *releng_autorelease_view_common_silicon

diff --git a/jjb/autorelease/view-autorelease-sodium.yaml b/jjb/autorelease/view-autorelease-sodium.yaml
index 654d8e7c6b9c1ca5eaeca3952396d1925e96e1b6..c949f00b47870788727cf6bdabee80b6e5087d3f 100644 (file)
--- a/jjb/autorelease/view-autorelease-sodium.yaml
+++ b/jjb/autorelease/view-autorelease-sodium.yaml
@@ -20,22 +20,22 @@
 
 - view:
     name: Merge-Sodium
 
 - view:
     name: Merge-Sodium

-    description: 'List of Sodium Merge jobs for Autorelease'
+    description: "List of Sodium Merge jobs for Autorelease"

     job-name:
     job-name:

-      - 'aaa-merge-sodium'
-      - 'bgpcep-merge-sodium'
-      - 'controller-merge-sodium'
-      - 'coe-merge-sodium'
-      - 'daexim-merge-sodium'
-      - 'genius-merge-sodium'
-      - 'infrautils-merge-sodium'
-      - 'integration/distribution-merge-sodium'
-      - 'lispflowmapping-merge-sodium'
-      - 'netconf-merge-sodium'
-      - 'netvirt-merge-sodium'
-      - 'neutron-merge-sodium'
-      - 'openflowplugin-merge-sodium'
-      - 'ovsdb-merge-sodium'
-      - 'serviceutils-merge-sodium'
-      - 'sfc-merge-sodium'
+      - "aaa-merge-sodium"
+      - "bgpcep-merge-sodium"
+      - "controller-merge-sodium"
+      - "coe-merge-sodium"
+      - "daexim-merge-sodium"
+      - "genius-merge-sodium"
+      - "infrautils-merge-sodium"
+      - "integration/distribution-merge-sodium"
+      - "lispflowmapping-merge-sodium"
+      - "netconf-merge-sodium"
+      - "netvirt-merge-sodium"
+      - "neutron-merge-sodium"
+      - "openflowplugin-merge-sodium"
+      - "ovsdb-merge-sodium"
+      - "serviceutils-merge-sodium"
+      - "sfc-merge-sodium"

     <<: *releng_autorelease_view_common_sodium
     <<: *releng_autorelease_view_common_sodium

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 17a5249c6eca6fc7495a05f699d3e7eee53cd411..ee5a334fee362611c650eeca56850372884cbb4c 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'bgpcep'
+    project: "bgpcep"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,49 +15,49 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter
+      odl-restconf,
+      odl-bgpcep-bgp,
+      odl-bgpcep-bgp-config-example,
+      odl-bgpcep-data-change-counter

 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test
     # environment or more complex scenario is chosen
     robot-options: >
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test
     # environment or more complex scenario is chosen
     robot-options: >

-        -v USE_NETCONF_CONNECTOR:False
-        -v COUNT:250000
-        -v INSERT:10
-        -v WITHDRAW:9
-        -v PREFILL:10
-        -v UPDATE:single
-        -v TEST_DURATION_MULTIPLIER:4
+      -v USE_NETCONF_CONNECTOR:False
+      -v COUNT:250000
+      -v INSERT:10
+      -v WITHDRAW:9
+      -v PREFILL:10
+      -v UPDATE:single
+      -v TEST_DURATION_MULTIPLIER:4

 
     # Controller configuration
     odl_system_flavor: odl-standard-4
 
     # Plot Info
 
     # Controller configuration
     odl_system_flavor: odl-standard-4
 
     # Plot Info

-    01-plot-title: 'Number of generated updates'
-    01-plot-yaxis: 'Total number of updates'
-    01-plot-group: 'BGP Scaling test suite'
-    01-plot-data-file: 'totals-bgp.csv'
-    02-plot-title: 'Generated load'
-    02-plot-yaxis: 'Updates per second'
-    02-plot-group: 'BGP Scaling test suite'
-    02-plot-data-file: 'performance-bgp.csv'
+    01-plot-title: "Number of generated updates"
+    01-plot-yaxis: "Total number of updates"
+    01-plot-group: "BGP Scaling test suite"
+    01-plot-data-file: "totals-bgp.csv"
+    02-plot-title: "Generated load"
+    02-plot-yaxis: "Updates per second"
+    02-plot-group: "BGP Scaling test suite"
+    02-plot-data-file: "performance-bgp.csv"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index f54addec5a47825a8f4a1076c606abbaf747eda9..89a6bf56f027b479713860c90847cfb35af9c8b2 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -6,47 +6,47 @@
       # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
       # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name

-    project: 'bgpcep'
+    project: "bgpcep"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'bgp-ingest'
+    functionality: "bgp-ingest"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-jolokia,
-        odl-bgpcep-data-change-counter,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example
+      odl-restconf,
+      odl-jolokia,
+      odl-bgpcep-data-change-counter,
+      odl-bgpcep-bgp,
+      odl-bgpcep-bgp-config-example

 
     # Robot custom options:
     robot-options: >
 
     # Robot custom options:
     robot-options: >

-        -v USE_NETCONF_CONNECTOR:False
-        -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:60
-        -v REPETITIONS_CHANGE_COUNT_SINGLE:1
-        -v CHECK_PERIOD_PREFIX_COUNT_MANY:60
-        -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0
-        -v REPETITIONS_CHANGE_COUNT_MANY:1
-        -v MULTIPLICITY_CHANGE_COUNT_MANY:10
-        -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
+      -v USE_NETCONF_CONNECTOR:False
+      -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:60
+      -v REPETITIONS_CHANGE_COUNT_SINGLE:1
+      -v CHECK_PERIOD_PREFIX_COUNT_MANY:60
+      -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0
+      -v REPETITIONS_CHANGE_COUNT_MANY:1
+      -v MULTIPLICITY_CHANGE_COUNT_MANY:10
+      -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0

 
     # Controller configuration
     odl_system_flavor: odl-standard-4
 
     # Controller configuration
     odl_system_flavor: odl-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 31d825701b4382819ead80d802c1a5b0898e1331..b0199200c2b5026842796e45e701be3c9d5b0880 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -5,37 +5,37 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'bgpcep'
+    project: "bgpcep"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'bgpclustering-ha'
+    functionality: "bgpclustering-ha"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-bgpcep-bmp,
-        odl-bgpcep-bmp-config-example,
-        odl-bgpcep-pcep
+      odl-restconf,
+      odl-bgpcep-bgp,
+      odl-bgpcep-bgp-config-example,
+      odl-bgpcep-bmp,
+      odl-bgpcep-bmp-config-example,
+      odl-bgpcep-pcep

 
     # Robot custom options:
 
     # Robot custom options:

-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index 404eb9848abfc93b2b7fd2a670701ab1f02fade0..7f9e2cd854c71f9b4874422f11c8e57084d65821 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -5,10 +5,10 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'bgpcep'
+    project: "bgpcep"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'bgpclustering-longevity'
+    functionality: "bgpclustering-longevity"

 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'


@@ -16,26 +16,26 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf-noauth,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example
+      odl-restconf-noauth,
+      odl-bgpcep-bgp,
+      odl-bgpcep-bgp-config-example

 
     # Built timeout
 
     # Built timeout

-    build-timeout: '1500'
+    build-timeout: "1500"

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index eb87a1c2d7ac7691549015a416fc6a1be1c54e14..d6d8229f423385b8912ed2f5f023ab09e31fd9fb 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -5,37 +5,37 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'bgpcep'
+    project: "bgpcep"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'bgpclustering'
+    functionality: "bgpclustering"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf-noauth,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example
+      odl-restconf-noauth,
+      odl-bgpcep-bgp,
+      odl-bgpcep-bgp-config-example

 
     # Robot custom options:
 
     # Robot custom options:

-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"

 
     # Controller configuration
 
     # Controller configuration

-    odl_system_flavor: 'odl-standard-4'
+    odl_system_flavor: "odl-standard-4"

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index de5e1fa7c0a16454ed76d63cd1cb60b2f343bd83..cf752231fb5a1e96f330ef904c49927ee47f8bef 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'bgpcep'
+    project: "bgpcep"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,33 +15,33 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-bgpcep-pcep'
+    install-features: "odl-restconf,odl-bgpcep-pcep"

 
     # Readiness check timeout is lowered from the suite's high default value.
     # The other options are workarounds for Sandbox not being as performant
     # as the private lab where this suite was developed.
     # Robot custom options:
     robot-options: >
 
     # Readiness check timeout is lowered from the suite's high default value.
     # The other options are workarounds for Sandbox not being as performant
     # as the private lab where this suite was developed.
     # Robot custom options:
     robot-options: >

-        -v USE_NETCONF_CONNECTOR:False
-        -v PCEP_READY_VERIFY_TIMEOUT:180
-        -v RESTCONF_REUSE:False
-        -v UPDATER_TIMEOUT:900
+      -v USE_NETCONF_CONNECTOR:False
+      -v PCEP_READY_VERIFY_TIMEOUT:180
+      -v RESTCONF_REUSE:False
+      -v UPDATER_TIMEOUT:900

 
     # Controller configuration
     odl_system_flavor: odl-standard-4
 
     # Controller configuration
     odl_system_flavor: odl-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index a2f3197fc38731f915965d7dbdea663c7b41498d..4d813874d86b0b5f220cfebd666184d05e306b9d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'bgpcep'
+    project: "bgpcep"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,30 +15,30 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-bgpcep-pcep,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-bgpcep-bmp,
-        odl-bgpcep-bmp-config-example,
-        odl-jolokia
+      odl-restconf,
+      odl-bgpcep-pcep,
+      odl-bgpcep-bgp,
+      odl-bgpcep-bgp-config-example,
+      odl-bgpcep-bmp,
+      odl-bgpcep-bmp-config-example,
+      odl-jolokia

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index 211b5997915a2789129208bdf640ac69af4dae08..a41bcccf3dffa6d9afefda4699f2e8b83b35ee55 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -5,29 +5,29 @@
       - inttest-patch-test
 
     # The project name
       - inttest-patch-test
 
     # The project name

-    project: 'bgpcep'
+    project: "bgpcep"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     feature:
       - bgp:
           csit-list: >
 
     feature:
       - bgp:
           csit-list: >

-              bgpcep-csit-1node-gate-userfeatures-all-{stream},
-              bgpcep-csit-1node-gate-bgp-ingest-mixed-all-{stream}
+            bgpcep-csit-1node-gate-userfeatures-all-{stream},
+            bgpcep-csit-1node-gate-bgp-ingest-mixed-all-{stream}

 
       - pcep:
           csit-list: >
 
       - pcep:
           csit-list: >

-              bgpcep-csit-1node-gate-userfeatures-all-{stream},
-              bgpcep-csit-1node-gate-throughpcep-all-{stream}
+            bgpcep-csit-1node-gate-userfeatures-all-{stream},
+            bgpcep-csit-1node-gate-throughpcep-all-{stream}

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 2b5773e3cd8cfc591c6aa26c4d6bf7cf4329c8c3..a31d0858c844cecb4f042744456f9a6ca996925e 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -2,9 +2,9 @@
 - project:
     name: bgpcep-silicon
     jobs:
 - project:
     name: bgpcep-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/


@@ -13,20 +13,20 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'bgpcep'
-    project-name: 'bgpcep'
+    project: "bgpcep"
+    project-name: "bgpcep"

     build-node: centos7-builder-8c-8g
     build-timeout: 120
     build-node: centos7-builder-8c-8g
     build-timeout: 120

-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx2048m'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "bgpcep-settings"
+    mvn-opts: "-Xmx2048m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      mdsal-merge-{stream}
+    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: 9427a05049030
 
     # Used by the release job
     staging-profile-id: 9427a05049030


@@ -34,9 +34,9 @@
 - project:
     name: bgpcep-aluminium
     jobs:
 - project:
     name: bgpcep-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/


@@ -45,20 +45,20 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'bgpcep'
-    project-name: 'bgpcep'
+    project: "bgpcep"
+    project-name: "bgpcep"

     build-node: centos7-builder-8c-8g
     build-timeout: 120
     build-node: centos7-builder-8c-8g
     build-timeout: 120

-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx2048m'
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "bgpcep-settings"
+    mvn-opts: "-Xmx2048m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      mdsal-merge-{stream}
+    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: 9427a05049030
 
     # Used by the release job
     staging-profile-id: 9427a05049030


@@ -66,9 +66,9 @@
 - project:
     name: bgpcep-magnesium
     jobs:
 - project:
     name: bgpcep-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/


@@ -77,20 +77,20 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'bgpcep'
-    project-name: 'bgpcep'
+    project: "bgpcep"
+    project-name: "bgpcep"

     build-node: centos7-builder-8c-8g
     build-timeout: 120
     build-node: centos7-builder-8c-8g
     build-timeout: 120

-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx2048m'
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "bgpcep-settings"
+    mvn-opts: "-Xmx2048m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      mdsal-merge-{stream}
+    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: 9427a05049030
 
     # Used by the release job
     staging-profile-id: 9427a05049030


@@ -98,9 +98,9 @@
 - project:
     name: bgpcep-sodium
     jobs:
 - project:
     name: bgpcep-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/


@@ -109,19 +109,19 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'bgpcep'
-    project-name: 'bgpcep'
+    project: "bgpcep"
+    project-name: "bgpcep"

     build-node: centos7-builder-8c-8g
     build-timeout: 120
     build-node: centos7-builder-8c-8g
     build-timeout: 120

-    branch: 'stable/sodium'
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx2048m'
+    branch: "stable/sodium"
+    mvn-settings: "bgpcep-settings"
+    mvn-opts: "-Xmx2048m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      mdsal-merge-{stream}
+    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: 9427a05049030
 
     # Used by the release job
     staging-profile-id: 9427a05049030


@@ -135,18 +135,18 @@
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -P!karaf
 
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -P!karaf
 

-    project: 'bgpcep'
-    project-name: 'bgpcep'
+    project: "bgpcep"
+    project-name: "bgpcep"

     build-node: centos7-builder-8c-8g
     build-timeout: 120
     build-node: centos7-builder-8c-8g
     build-timeout: 120

-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx1024m'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "bgpcep-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: bgpcep-info
 
 - project:
     name: bgpcep-info

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 965b693630e51184cb2182c875f9d59f329aaa87..2479a07297e59589360d77c602d5d68b799ecf95 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -6,36 +6,36 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'bier'
+    project: "bier"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'basic'
+    functionality: "basic"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    verify-stream: 'sodium'
-    verify-branch: 'stable/sodium'
-    verify-karaf-version: 'karaf4'
+    verify-stream: "sodium"
+    verify-branch: "stable/sodium"
+    verify-karaf-version: "karaf4"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-bier-all'
+    install-features: "odl-bier-all"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index dcc3761b12320f3fdf740c47f75910c4d125c2a2..789c0ddca616864965e34f8794d48550c7be5fbe 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -6,15 +6,15 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'bier'
-    project-name: 'bier'
-    branch: 'master'
+    project: "bier"
+    project-name: "bier"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[bier]'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -27,15 +27,15 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/aluminium'
+    project: "bier"
+    project-name: "bier"
+    branch: "stable/aluminium"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[bier]'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -48,15 +48,15 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/magnesium'
+    project: "bier"
+    project-name: "bier"
+    branch: "stable/magnesium"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[bier]'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -69,15 +69,15 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/sodium'
+    project: "bier"
+    project-name: "bier"
+    branch: "stable/sodium"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[bier]'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[bier]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -99,17 +99,17 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'bier'
-    project-name: 'bier'
-    branch: 'master'
+    project: "bier"
+    project-name: "bier"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "bier-settings"
+    mvn-opts: "-Xmx1024m"

     disable-job: true
     sonarcloud: true
     disable-job: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: bier-info
 
 - project:
     name: bier-info

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index 37fc2fbd151eac3bcc1888d98662f5da391f962d..6392e1cde853baf1c29d3cd30430557ce6f60294 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -2,7 +2,7 @@
 - project:
     name: coe-silicon
     jobs:
 - project:
     name: coe-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/


@@ -10,15 +10,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'coe'
-    project-name: 'coe'
+    project: "coe"
+    project-name: "coe"

     stream: silicon
     stream: silicon

-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[coe] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -27,7 +27,7 @@
 - project:
     name: coe-aluminium
     jobs:
 - project:
     name: coe-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/


@@ -35,15 +35,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'coe'
-    project-name: 'coe'
+    project: "coe"
+    project-name: "coe"

     stream: aluminium
     stream: aluminium

-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[coe] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -52,7 +52,7 @@
 - project:
     name: coe-magnesium
     jobs:
 - project:
     name: coe-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/


@@ -60,15 +60,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'coe'
-    project-name: 'coe'
+    project: "coe"
+    project-name: "coe"

     stream: magnesium
     stream: magnesium

-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[coe] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -77,8 +77,8 @@
 - project:
     name: coe-sodium
     jobs:
 - project:
     name: coe-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
           build-node: centos7-builder-2c-2g
           project-pattern: coe
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/


@@ -86,14 +86,14 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    project: 'coe'
-    project-name: 'coe'
+    project: "coe"
+    project-name: "coe"

     stream: sodium
     stream: sodium

-    branch: 'stable/sodium'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    branch: "stable/sodium"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[coe] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -104,16 +104,16 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'coe'
-    project-name: 'coe'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "coe"
+    project-name: "coe"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "coe-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: coe-info
 
 - project:
     name: coe-info

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 71769193b58aca77e4346ea88420dc9f57fe576b..5bb684038f3eb8eba23063870f407a73689ebedf 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -5,36 +5,36 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'akka1'
+    functionality: "akka1"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # No tools system VMs needed in for this job
     tools_system_count: 0
 
     # Features to install
     install-features: >
 
     # No tools system VMs needed in for this job
     tools_system_count: 0
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-clustering-test-app,
-        odl-jolokia
+      odl-restconf,
+      odl-clustering-test-app,
+      odl-jolokia

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 9fb0e7d6b6fadb2aad54072800f35a6f4943f2a0..e6ed39b347df785669af52adc8adaacff45a5dbc 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -4,32 +4,32 @@
     jobs:
       - inttest-csit-3node
 
     jobs:
       - inttest-csit-3node
 

-    project: 'controller'
+    project: "controller"

     functionality:
     functionality:

-      - 'clustering-ask'
-      - 'clustering-tell'
+      - "clustering-ask"
+      - "clustering-tell"

 
 

-    elasticsearch-attribute: 'disabled'
+    elasticsearch-attribute: "disabled"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     tools_system_count: 0
 
     install-features: >
 
     tools_system_count: 0
 
     install-features: >

-        odl-restconf,
-        odl-clustering-test-app
+      odl-restconf,
+      odl-clustering-test-app

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index dc7dbbc5cf3386b9608c904c6a335bb748f3c8ee..7d8a9bcc9960fb4459a350a5dc391f253a835d46 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -5,10 +5,10 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'cs-chasing-leader-longevity'
+    functionality: "cs-chasing-leader-longevity"

 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'


@@ -16,25 +16,25 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf-noauth,
-        odl-clustering-test-app
+      odl-restconf-noauth,
+      odl-clustering-test-app

 
     # Built timeout
 
     # Built timeout

-    build-timeout: '1500'
+    build-timeout: "1500"

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index a2ffdf314bda8af99486c3e23eadc656bd93510b..3f2deba29a471443cd66ac649b663a1b8904b537 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -5,10 +5,10 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'cs-partnheal-longevity'
+    functionality: "cs-partnheal-longevity"

 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'


@@ -16,25 +16,25 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf-noauth,
-        odl-clustering-test-app
+      odl-restconf-noauth,
+      odl-clustering-test-app

 
     # Built timeout
 
     # Built timeout

-    build-timeout: '1500'
+    build-timeout: "1500"

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index c153a214afe61ec777c26583fa859c136af80781..ecd6bc93f7908da71d260c787e9679b7417f34fb 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -5,10 +5,10 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'ddb-expl-lead-movement-longevity'
+    functionality: "ddb-expl-lead-movement-longevity"

 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'


@@ -16,25 +16,25 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf-noauth,
-        odl-clustering-test-app
+      odl-restconf-noauth,
+      odl-clustering-test-app

 
     # Built timeout
 
     # Built timeout

-    build-timeout: '1500'
+    build-timeout: "1500"

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index fa781a2489aafe62fd8c1bf0edcfb276236df6c9..23bb7c0d4705b5721c7bcf59f567022cd8065e94 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -5,10 +5,10 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'notifications-longevity'
+    functionality: "notifications-longevity"

 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'


@@ -16,25 +16,25 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-clustering-test-app
+      odl-restconf,
+      odl-clustering-test-app

 
     # Built timeout
 
     # Built timeout

-    build-timeout: '1500'
+    build-timeout: "1500"

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 08321c976557216c4ca7372e4883ae0d8196e77b..9a0eae3538cdbcadf91c0e25d7f39d6042ea618e 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -5,10 +5,10 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'drb-partnheal-longevity'
+    functionality: "drb-partnheal-longevity"

 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'


@@ -16,25 +16,25 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf-noauth,
-        odl-clustering-test-app
+      odl-restconf-noauth,
+      odl-clustering-test-app

 
     # Built timeout
 
     # Built timeout

-    build-timeout: '1500'
+    build-timeout: "1500"

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index bebcd320605e18554c21d5bbd28bcb37ae1083a5..bcd33f87c5f268ffefed6986d360e7b6a4cd0c8d 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -5,10 +5,10 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'drb-precedence-longevity'
+    functionality: "drb-precedence-longevity"

 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'


@@ -16,25 +16,25 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf-noauth,
-        odl-clustering-test-app
+      odl-restconf-noauth,
+      odl-clustering-test-app

 
     # Built timeout
 
     # Built timeout

-    build-timeout: '1500'
+    build-timeout: "1500"

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 6554f15083c2b28554ed85158283e14f659e0acb..6cb8b005ad0f5057b013382c988d8416553954cd 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -5,107 +5,107 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'benchmark'
+    functionality: "benchmark"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-mdsal-benchmark
+      odl-restconf,
+      odl-mdsal-benchmark

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '--exclude singlenode_setup -v WARMUPS:1 -v RUNS:3'
+    robot-options: "--exclude singlenode_setup -v WARMUPS:1 -v RUNS:3"

 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.

-    odl_system_flavor: 'odl-standard-4'
+    odl_system_flavor: "odl-standard-4"

 
 

-    build-timeout: '480'
+    build-timeout: "480"

 
     # Plot Info
 
     # Plot Info

-    01-plot-title: 'Performance by structure'
-    01-plot-yaxis: 'Average total time [ms]'
-    01-plot-group: 'MD-SAL Data Store Performance'
-    01-plot-data-file: 'perf_per_struct.csv'
-    02-plot-title: 'Performance by operations'
-    02-plot-yaxis: 'Average total time [ms]'
-    02-plot-group: 'MD-SAL Data Store Performance'
-    02-plot-data-file: 'perf_per_ops.csv'
+    01-plot-title: "Performance by structure"
+    01-plot-yaxis: "Average total time [ms]"
+    01-plot-group: "MD-SAL Data Store Performance"
+    01-plot-data-file: "perf_per_struct.csv"
+    02-plot-title: "Performance by operations"
+    02-plot-yaxis: "Average total time [ms]"
+    02-plot-group: "MD-SAL Data Store Performance"
+    02-plot-data-file: "perf_per_ops.csv"

 
 

-    03-plot-data-file: 'perf_per_struct.csv'
-    03-plot-title: 'Config performance by structure PUT'
-    03-plot-yaxis: 'Average total time [ms]'
-    03-plot-group: 'MD-SAL Data Store Performance'
-    03-inclusion-flag: 'include-by-string'
+    03-plot-data-file: "perf_per_struct.csv"
+    03-plot-title: "Config performance by structure PUT"
+    03-plot-yaxis: "Average total time [ms]"
+    03-plot-group: "MD-SAL Data Store Performance"
+    03-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    03-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC'
-    04-plot-data-file: 'perf_per_struct.csv'
-    04-plot-title: 'Config performance by structure READ'
-    04-plot-yaxis: 'Average total time [ms]'
-    04-plot-group: 'MD-SAL Data Store Performance'
-    04-inclusion-flag: 'include-by-string'
+    03-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC"
+    04-plot-data-file: "perf_per_struct.csv"
+    04-plot-title: "Config performance by structure READ"
+    04-plot-yaxis: "Average total time [ms]"
+    04-plot-group: "MD-SAL Data Store Performance"
+    04-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    04-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC'
-    05-plot-data-file: 'perf_per_struct.csv'
-    05-plot-title: 'Operational performance by structure MERGE'
-    05-plot-yaxis: 'Average total time [ms]'
-    05-plot-group: 'MD-SAL Data Store Performance'
-    05-inclusion-flag: 'include-by-string'
+    04-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC"
+    05-plot-data-file: "perf_per_struct.csv"
+    05-plot-title: "Operational performance by structure MERGE"
+    05-plot-yaxis: "Average total time [ms]"
+    05-plot-group: "MD-SAL Data Store Performance"
+    05-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    05-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC'
-    06-plot-data-file: 'perf_per_struct.csv'
-    06-plot-title: 'Operational performance by structure DELETE'
-    06-plot-yaxis: 'Average total time [ms]'
-    06-plot-group: 'MD-SAL Data Store Performance'
-    06-inclusion-flag: 'include-by-string'
+    05-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC"
+    06-plot-data-file: "perf_per_struct.csv"
+    06-plot-title: "Operational performance by structure DELETE"
+    06-plot-yaxis: "Average total time [ms]"
+    06-plot-group: "MD-SAL Data Store Performance"
+    06-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    06-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC'
+    06-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC"

 
 

-    07-plot-data-file: 'perf_per_ops.csv'
-    07-plot-title: 'Config performance by operations PUT'
-    07-plot-yaxis: 'Average total time [ms]'
-    07-plot-group: 'MD-SAL Data Store Performance'
-    07-inclusion-flag: 'include-by-string'
+    07-plot-data-file: "perf_per_ops.csv"
+    07-plot-title: "Config performance by operations PUT"
+    07-plot-yaxis: "Average total time [ms]"
+    07-plot-group: "MD-SAL Data Store Performance"
+    07-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    07-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC'
-    08-plot-data-file: 'perf_per_ops.csv'
-    08-plot-title: 'Config performance by operations READ'
-    08-plot-yaxis: 'Average total time [ms]'
-    08-plot-group: 'MD-SAL Data Store Performance'
-    08-inclusion-flag: 'include-by-string'
+    07-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC"
+    08-plot-data-file: "perf_per_ops.csv"
+    08-plot-title: "Config performance by operations READ"
+    08-plot-yaxis: "Average total time [ms]"
+    08-plot-group: "MD-SAL Data Store Performance"
+    08-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    08-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC'
-    09-plot-data-file: 'perf_per_ops.csv'
-    09-plot-title: 'Operational performance by operations MERGE'
-    09-plot-yaxis: 'Average total time [ms]'
-    09-plot-group: 'MD-SAL Data Store Performance'
-    09-inclusion-flag: 'include-by-string'
+    08-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC"
+    09-plot-data-file: "perf_per_ops.csv"
+    09-plot-title: "Operational performance by operations MERGE"
+    09-plot-yaxis: "Average total time [ms]"
+    09-plot-group: "MD-SAL Data Store Performance"
+    09-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    09-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC'
-    10-plot-data-file: 'perf_per_ops.csv'
-    10-plot-title: 'Operational performance by operations DELETE'
-    10-plot-yaxis: 'Average total time [ms]'
-    10-plot-group: 'MD-SAL Data Store Performance'
-    10-inclusion-flag: 'include-by-string'
+    09-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC"
+    10-plot-data-file: "perf_per_ops.csv"
+    10-plot-title: "Operational performance by operations DELETE"
+    10-plot-yaxis: "Average total time [ms]"
+    10-plot-group: "MD-SAL Data Store Performance"
+    10-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    10-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC'
+    10-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC"

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index bb3bc292af6075d7f1cd6afbfbbd41c945c473e8..5d905d9576ad88773c2ac49915a358fa6ab7b32d 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -5,106 +5,106 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'benchmark'
+    functionality: "benchmark"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-mdsal-benchmark,
-        odl-jolokia
+      odl-restconf,
+      odl-mdsal-benchmark,
+      odl-jolokia

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '--exclude clustered_setup'
+    robot-options: "--exclude clustered_setup"

 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
     odl_system_flavor: odl-standard-4
 
     # Plot Info
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
     odl_system_flavor: odl-standard-4
 
     # Plot Info

-    01-plot-title: 'Performance by structure'
-    01-plot-yaxis: 'Average total time [ms]'
-    01-plot-group: 'MD-SAL Data Store Performance'
-    01-plot-data-file: 'perf_per_struct.csv'
-    02-plot-title: 'Performance by operations'
-    02-plot-yaxis: 'Average total time [ms]'
-    02-plot-group: 'MD-SAL Data Store Performance'
-    02-plot-data-file: 'perf_per_ops.csv'
+    01-plot-title: "Performance by structure"
+    01-plot-yaxis: "Average total time [ms]"
+    01-plot-group: "MD-SAL Data Store Performance"
+    01-plot-data-file: "perf_per_struct.csv"
+    02-plot-title: "Performance by operations"
+    02-plot-yaxis: "Average total time [ms]"
+    02-plot-group: "MD-SAL Data Store Performance"
+    02-plot-data-file: "perf_per_ops.csv"

 
 

-    03-plot-data-file: 'perf_per_struct.csv'
-    03-plot-title: 'Performance by structure PUT'
-    03-plot-yaxis: 'Average total time [ms]'
-    03-plot-group: 'MD-SAL Data Store Performance'
-    03-inclusion-flag: 'include-by-string'
+    03-plot-data-file: "perf_per_struct.csv"
+    03-plot-title: "Performance by structure PUT"
+    03-plot-yaxis: "Average total time [ms]"
+    03-plot-group: "MD-SAL Data Store Performance"
+    03-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    03-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC'
-    04-plot-data-file: 'perf_per_struct.csv'
-    04-plot-title: 'Performance by structure READ'
-    04-plot-yaxis: 'Average total time [ms]'
-    04-plot-group: 'MD-SAL Data Store Performance'
-    04-inclusion-flag: 'include-by-string'
+    03-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC"
+    04-plot-data-file: "perf_per_struct.csv"
+    04-plot-title: "Performance by structure READ"
+    04-plot-yaxis: "Average total time [ms]"
+    04-plot-group: "MD-SAL Data Store Performance"
+    04-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    04-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC'
-    05-plot-data-file: 'perf_per_struct.csv'
-    05-plot-title: 'Performance by structure MERGE'
-    05-plot-yaxis: 'Average total time [ms]'
-    05-plot-group: 'MD-SAL Data Store Performance'
-    05-inclusion-flag: 'include-by-string'
+    04-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC"
+    05-plot-data-file: "perf_per_struct.csv"
+    05-plot-title: "Performance by structure MERGE"
+    05-plot-yaxis: "Average total time [ms]"
+    05-plot-group: "MD-SAL Data Store Performance"
+    05-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    05-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC'
-    06-plot-data-file: 'perf_per_struct.csv'
-    06-plot-title: 'Performance by structure DELETE'
-    06-plot-yaxis: 'Average total time [ms]'
-    06-plot-group: 'MD-SAL Data Store Performance'
-    06-inclusion-flag: 'include-by-string'
+    05-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC"
+    06-plot-data-file: "perf_per_struct.csv"
+    06-plot-title: "Performance by structure DELETE"
+    06-plot-yaxis: "Average total time [ms]"
+    06-plot-group: "MD-SAL Data Store Performance"
+    06-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    06-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC'
+    06-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC"

 
 

-    07-plot-data-file: 'perf_per_ops.csv'
-    07-plot-title: 'Performance by operations PUT'
-    07-plot-yaxis: 'Average total time [ms]'
-    07-plot-group: 'MD-SAL Data Store Performance'
-    07-inclusion-flag: 'include-by-string'
+    07-plot-data-file: "perf_per_ops.csv"
+    07-plot-title: "Performance by operations PUT"
+    07-plot-yaxis: "Average total time [ms]"
+    07-plot-group: "MD-SAL Data Store Performance"
+    07-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    07-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC'
-    08-plot-data-file: 'perf_per_ops.csv'
-    08-plot-title: 'Performance by operations READ'
-    08-plot-yaxis: 'Average total time [ms]'
-    08-plot-group: 'MD-SAL Data Store Performance'
-    08-inclusion-flag: 'include-by-string'
+    07-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC"
+    08-plot-data-file: "perf_per_ops.csv"
+    08-plot-title: "Performance by operations READ"
+    08-plot-yaxis: "Average total time [ms]"
+    08-plot-group: "MD-SAL Data Store Performance"
+    08-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    08-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC'
-    09-plot-data-file: 'perf_per_ops.csv'
-    09-plot-title: 'Performance by operations MERGE'
-    09-plot-yaxis: 'Average total time [ms]'
-    09-plot-group: 'MD-SAL Data Store Performance'
-    09-inclusion-flag: 'include-by-string'
+    08-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC"
+    09-plot-data-file: "perf_per_ops.csv"
+    09-plot-title: "Performance by operations MERGE"
+    09-plot-yaxis: "Average total time [ms]"
+    09-plot-group: "MD-SAL Data Store Performance"
+    09-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    09-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC'
-    10-plot-data-file: 'perf_per_ops.csv'
-    10-plot-title: 'Performance by operations DELETE'
-    10-plot-yaxis: 'Average total time [ms]'
-    10-plot-group: 'MD-SAL Data Store Performance'
-    10-inclusion-flag: 'include-by-string'
+    09-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC"
+    10-plot-data-file: "perf_per_ops.csv"
+    10-plot-title: "Performance by operations DELETE"
+    10-plot-yaxis: "Average total time [ms]"
+    10-plot-group: "MD-SAL Data Store Performance"
+    10-inclusion-flag: "include-by-string"

     # yamllint disable-line rule:line-length
     # yamllint disable-line rule:line-length

-    10-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC'
+    10-exclude-value: "CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC"

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 1bd14cd1b43b70e7a5f8c22f87fc1b04ae653d5b..a814c67fd71404748112d4508b4d8b98e7f0b7ef 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -5,33 +5,33 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'rest-cars-perf'
+    functionality: "rest-cars-perf"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-clustering-test-app
+      odl-restconf,
+      odl-clustering-test-app

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index f97af95af4bde769468373e36f56f4a77123e8e2..643daafa104fc37e66635f174dbc54c5fd2eda50 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -5,35 +5,35 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'controller'
+    project: "controller"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:

-      - 'rest-clust-cars-perf-ask'
-      - 'rest-clust-cars-perf-tell'
+      - "rest-clust-cars-perf-ask"
+      - "rest-clust-cars-perf-tell"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-clustering-test-app
+      odl-restconf,
+      odl-clustering-test-app

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
index d443e919b751c31f69058e8ec6fffbe257033ac7..eded0676dbe6f4378334a44da6c700a7e3468276 100644 (file)
--- a/jjb/controller/controller-patch-test.yaml
+++ b/jjb/controller/controller-patch-test.yaml
@@ -4,40 +4,40 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'controller'
+    project: "controller"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
-    jdk: 'openjdk8'
+    os-branch: "queens"
+    jdk: "openjdk8"

 
     feature:
       - core:
           csit-list: >
 
     feature:
       - core:
           csit-list: >

-              controller-csit-1node-akka1-all-{stream},
-              controller-csit-1node-rest-cars-perf-all-{stream},
-              controller-csit-3node-clustering-ask-all-{stream},
-              controller-csit-3node-clustering-tell-all-{stream}
+            controller-csit-1node-akka1-all-{stream},
+            controller-csit-1node-rest-cars-perf-all-{stream},
+            controller-csit-3node-clustering-ask-all-{stream},
+            controller-csit-3node-clustering-tell-all-{stream}

 
       - netvirt:
           csit-list: >
 
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 48734b30dcbc3a6309aabf3e6170c83b406f05c2..ae9c7a24e340d2de0f766475f6d6f428386d98ec 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,7 +2,7 @@
 - project:
     name: controller-master
     jobs:
 - project:
     name: controller-master
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/


@@ -11,17 +11,17 @@
       - odl-maven-verify-jobs
 
     stream: master
       - odl-maven-verify-jobs
 
     stream: master

-    project: 'controller'
-    project-name: 'controller'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
+    project: "controller"
+    project-name: "controller"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"

     mvn-version: mvn36
     mvn-version: mvn36

-    mvn-goals: 'clean deploy -Pdocs'
-    mvn-opts: '-Xmx3072m -Dmaven.compile.fork=true'
+    mvn-goals: "clean deploy -Pdocs"
+    mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"

     build-timeout: 90
     build-timeout: 90

-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"

 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd


@@ -29,8 +29,8 @@
 - project:
     name: controller-magnesium
     jobs:
 - project:
     name: controller-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}':
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}":
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/


@@ -39,17 +39,17 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    project: "controller"
+    project-name: "controller"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
+    mvn-goals: "clean deploy -Pintegrationtests,docs"
+    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"

     build-node: centos7-builder-8c-8g
     build-timeout: 90
     build-node: centos7-builder-8c-8g
     build-timeout: 90

-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"

 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd


@@ -57,8 +57,8 @@
 - project:
     name: controller-sodium
     jobs:
 - project:
     name: controller-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/


@@ -67,16 +67,16 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/sodium'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    project: "controller"
+    project-name: "controller"
+    branch: "stable/sodium"
+    mvn-settings: "controller-settings"
+    mvn-goals: "clean deploy -Pintegrationtests,docs"
+    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"

     build-node: centos7-builder-8c-8g
     build-timeout: 90
     build-node: centos7-builder-8c-8g
     build-timeout: 90

-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"

 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd


@@ -100,17 +100,17 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'controller'
-    project-name: 'controller'
+    project: "controller"
+    project-name: "controller"

     branch: master
     branch: master

-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
+    mvn-goals: "clean deploy -Pintegrationtests,docs"
+    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: controller-info
 
 - project:
     name: controller-info

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 577cd224f5670a5697bbe36dd8b8b023265889f7..6f5a927be4864dcf68187c66cbd0a295f422eeb7 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -5,34 +5,34 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'daexim'
+    project: "daexim"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'basic'
+    functionality: "basic"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # no mininet required
     tools_system_count: 0
 
     # Features to install
 
     # no mininet required
     tools_system_count: 0
 
     # Features to install

-    install-features: 'odl-daexim-all,odl-netconf-topology,odl-jolokia'
+    install-features: "odl-daexim-all,odl-netconf-topology,odl-jolokia"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index eef4b47dc41f2b8f8ec95823143f2392f2992bc9..f811cea4311419c68e5c9e25bfba6aa8a2e55795 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -5,34 +5,34 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'daexim'
+    project: "daexim"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'clustering-basic'
+    functionality: "clustering-basic"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # no mininet required
     tools_system_count: 0
 
     # Features to install
 
     # no mininet required
     tools_system_count: 0
 
     # Features to install

-    install-features: 'odl-daexim-all,odl-netconf-topology,odl-jolokia'
+    install-features: "odl-daexim-all,odl-netconf-topology,odl-jolokia"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index fae0e5c14d3931b68672bde7bf9b01542a81d02f..481a146646e72cd76298b2effac9646713ee6bf1 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -2,8 +2,8 @@
 - project:
     name: daexim-silicon
     jobs:
 - project:
     name: daexim-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/


@@ -11,15 +11,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'daexim'
-    project-name: 'daexim'
+    project: "daexim"
+    project-name: "daexim"

     stream: silicon
     stream: silicon

-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "daexim-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7


@@ -27,8 +27,8 @@
 - project:
     name: daexim-aluminium
     jobs:
 - project:
     name: daexim-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/


@@ -36,15 +36,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'daexim'
-    project-name: 'daexim'
+    project: "daexim"
+    project-name: "daexim"

     stream: aluminium
     stream: aluminium

-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "daexim-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7


@@ -52,8 +52,8 @@
 - project:
     name: daexim-magnesium
     jobs:
 - project:
     name: daexim-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/


@@ -61,15 +61,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'daexim'
-    project-name: 'daexim'
+    project: "daexim"
+    project-name: "daexim"

     stream: magnesium
     stream: magnesium

-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "daexim-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7


@@ -77,8 +77,8 @@
 - project:
     name: daexim-sodium
     jobs:
 - project:
     name: daexim-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/


@@ -86,14 +86,14 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    project: 'daexim'
-    project-name: 'daexim'
+    project: "daexim"
+    project-name: "daexim"

     stream: sodium
     stream: sodium

-    branch: 'stable/sodium'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    branch: "stable/sodium"
+    mvn-settings: "daexim-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7


@@ -103,16 +103,16 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'daexim'
-    project-name: 'daexim'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "daexim"
+    project-name: "daexim"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "daexim-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: daexim-info
 
 - project:
     name: daexim-info

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 0f93775a0e6870db234c9cadcc06838b18eb0b80..dc639ca7224b48d62a7def0b63b7bee5ff8ba9dc 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -3,88 +3,88 @@
 
 - defaults:
     name: global
 
 - defaults:
     name: global

-    prefix: ""  # A prefix for job names sandbox for example: user-
+    prefix: "" # A prefix for job names sandbox for example: user-

 
     karaf-version: karaf4
     build-days-to-keep: 30
 
     karaf-version: karaf4
     build-days-to-keep: 30

-    use-features-boot: 'True'
+    use-features-boot: "True"

 
     # File triggers
 
     # File triggers

-    files: '**'
-    forbidden-files: ''
+    files: "**"
+    forbidden-files: ""

 
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-builder-4c-4g
 
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-builder-4c-4g

-    schedule: ''
-    schedule-daily: 'H H * * *'
-    schedule-saturday: 'H H * * 6'
-    schedule-weekly: 'H 23 * * 6'
+    schedule: ""
+    schedule-daily: "H H * * *"
+    schedule-saturday: "H H * * 6"
+    schedule-weekly: "H 23 * * 6"

 
 

-    email-recipients: 'jenkins@lists.opendaylight.org'
-    odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
-    networking-l2gw-repo: 'http://git.openstack.org/openstack/networking-l2gw'
-    devstack-kubernetes-plugin-repo: 'https://github.com/openstack/kuryr-kubernetes'
-    devstack-lbaas-plugin-repo: 'https://github.com/openstack/neutron-lbaas'
-    devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
+    email-recipients: "jenkins@lists.opendaylight.org"
+    odl-ml2-driver-repo: "https://github.com/openstack/networking-odl"
+    networking-l2gw-repo: "http://git.openstack.org/openstack/networking-l2gw"
+    devstack-kubernetes-plugin-repo: "https://github.com/openstack/kuryr-kubernetes"
+    devstack-lbaas-plugin-repo: "https://github.com/openstack/neutron-lbaas"
+    devstack-networking-sfc-plugin-repo: "https://github.com/openstack/networking-sfc"

 
     # lf-infra defaults
     jenkins-ssh-credential: jenkins-ssh
 
     # lf-infra defaults
     jenkins-ssh-credential: jenkins-ssh

-    jenkins-ssh-release-credential: 'jenkins-release'
+    jenkins-ssh-release-credential: "jenkins-release"

     gerrit-server-name: OpenDaylight
     mvn-site-id: opendaylight-site
     mvn-snapshot-id: opendaylight-snapshot
     mvn-staging-id: opendaylight-staging
     nexus-snapshot-repo: opendaylight.snapshot
     gerrit-server-name: OpenDaylight
     mvn-site-id: opendaylight-site
     mvn-snapshot-id: opendaylight-snapshot
     mvn-staging-id: opendaylight-staging
     nexus-snapshot-repo: opendaylight.snapshot

-    git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
+    git-url: "ssh://jenkins-$SILO@git.opendaylight.org:29418"

     lftools-version: <1.0.0
 
     # defaults for parameters installing openstack for csit jobs
     lftools-version: <1.0.0
 
     # defaults for parameters installing openstack for csit jobs

-    devstack-hash: ''
-    create-initial-networks: 'False'
-    disable-odl-l3-service-plugin: 'no'
-    disable-openstack-services: ''
-    enable-networking-l2gw: 'no'
-    enable-openstack-plugins: 'networking-odl'
-    enable-openstack-services: ''
-    enable-openstack-compute-services: ''
-    enable-openstack-network-services: 'neutron,neutron-api,neutron-dhcp,neutron-metadata-agent'
-    enable-gre-type-driver: 'no'
-    ipsec-vxlan-tunnels-enabled: 'no'
-    lbaas-service-provider: ''
+    devstack-hash: ""
+    create-initial-networks: "False"
+    disable-odl-l3-service-plugin: "no"
+    disable-openstack-services: ""
+    enable-networking-l2gw: "no"
+    enable-openstack-plugins: "networking-odl"
+    enable-openstack-services: ""
+    enable-openstack-compute-services: ""
+    enable-openstack-network-services: "neutron,neutron-api,neutron-dhcp,neutron-metadata-agent"
+    enable-gre-type-driver: "no"
+    ipsec-vxlan-tunnels-enabled: "no"
+    lbaas-service-provider: ""

     num-openstack-sites: 1
     num-openstack-sites: 1

-    odl-ml2-driver-version: 'v1'
-    odl-ml2-port-binding: 'network-topology'
-    public-bridge: 'br-physnet1'
-    public-physical-network: 'physnet1'
-    security-group-mode: 'none'
-    tenant-network-type: 'vxlan'
-    odl-sfc-driver: 'odl'
-    odl-snat-mode: 'controller'
-    group-add-mod-enabled: 'false'
-    enable-itm-direct-tunnels: 'false'
-    openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
+    odl-ml2-driver-version: "v1"
+    odl-ml2-port-binding: "network-topology"
+    public-bridge: "br-physnet1"
+    public-physical-network: "physnet1"
+    security-group-mode: "none"
+    tenant-network-type: "vxlan"
+    odl-sfc-driver: "odl"
+    odl-snat-mode: "controller"
+    group-add-mod-enabled: "false"
+    enable-itm-direct-tunnels: "false"
+    openstack_legacy_default_network_services: "q-dhcp,q-meta,q-svc"

     os-cmb-cnt: 1
     os-ctl-cnt: 0
     os-cmp-cnt: 0
     os-cmb-cnt: 1
     os-ctl-cnt: 0
     os-cmp-cnt: 0

-    os-std-topo: '0cmb-1ctl-2cmp'
-    ovs-install: ''
+    os-std-topo: "0cmb-1ctl-2cmp"
+    ovs-install: ""

 
     # openstack-infra-parameters defaults
 
     # openstack-infra-parameters defaults

-    archive-artifacts: ''
+    archive-artifacts: ""

     branch: master
     branch: master

-    distribution_branch: '$GERRIT_BRANCH'
+    distribution_branch: "$GERRIT_BRANCH"

     os-cloud: vex
 
     # Distribution bundle URL
     os-cloud: vex
 
     # Distribution bundle URL

-    bundle-url: 'last'
-    repo-url: ''
-    install-features: ''
-    sm-repos: ''
-    sm-features: ''
+    bundle-url: "last"
+    repo-url: ""
+    install-features: ""
+    sm-repos: ""
+    sm-features: ""

 
     # Elasticsearch attribute
 
     # Elasticsearch attribute

-    elasticsearch-attribute: 'disabled'
+    elasticsearch-attribute: "disabled"

 
     # CSIT images configuration
     openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
 
     # CSIT images configuration
     openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851


@@ -92,11 +92,11 @@
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
 
     # Default Robot framework options
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
 
     # Default Robot framework options

-    robot-options: ''
-    trigger-jobs: ''
-    debug-map: ''
-    test-suites: ''
-    gate-job: 'False'
+    robot-options: ""
+    trigger-jobs: ""
+    debug-map: ""
+    test-suites: ""
+    gate-job: "False"

 
     # Data for csit-verify jobs
     # Branch for "last" version detection
 
     # Data for csit-verify jobs
     # Branch for "last" version detection


@@ -107,156 +107,156 @@
     verify-jdkversion: openjdk8
 
     # Maven / Java
     verify-jdkversion: openjdk8
 
     # Maven / Java

-    java-version: 'openjdk8'
-    jre: 'openjdk8'
+    java-version: "openjdk8"
+    jre: "openjdk8"

     opendaylight-infra-mvn-opts: |
     opendaylight-infra-mvn-opts: |

-        --show-version
-        --batch-mode
-        -Djenkins
-        -Dmaven.repo.local=/tmp/r
-        -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+      --show-version
+      --batch-mode
+      -Djenkins
+      -Dmaven.repo.local=/tmp/r
+      -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r

     opendaylight-infra-parallel-mvn-opts: |
     opendaylight-infra-parallel-mvn-opts: |

-        -T1.5C
-        {opendaylight-infra-mvn-opts}
+      -T1.5C
+      {opendaylight-infra-mvn-opts}

 
     # JavaDoc
     javadoc-path: org.opendaylight.$PROJECT/$STREAM
 
     # Python
 
     # JavaDoc
     javadoc-path: org.opendaylight.$PROJECT/$STREAM
 
     # Python

-    toxdir: ''
+    toxdir: ""

 
     # Sonarcloud config
     sonarcloud_api_token: 9bc1618a11c4bbe474ac542af84f655c545627c1
     sonarcloud_project_organization: opendaylight
 
     # Plot configuration
 
     # Sonarcloud config
     sonarcloud_api_token: 9bc1618a11c4bbe474ac542af84f655c545627c1
     sonarcloud_project_organization: opendaylight
 
     # Plot configuration

-    01-plot-title: ''
-    01-plot-yaxis: ''
-    01-plot-group: 'Default Plot Group'
-    01-plot-data-file: 'plot-data.csv'
-    02-plot-title: ''
-    02-plot-yaxis: ''
-    02-plot-group: 'Default Plot Group'
-    02-plot-data-file: 'plot-data.csv'
-    03-plot-data-file: '03-nonexisting.csv'
-    03-plot-title: ''
-    03-plot-yaxis: ''
-    03-plot-group: ''
-    03-inclusion-flag: 'off'
-    03-exclude-value: ''
-    04-plot-data-file: '04-nonexisting.csv'
-    04-plot-title: ''
-    04-plot-yaxis: ''
-    04-plot-group: ''
-    04-inclusion-flag: 'off'
-    04-exclude-value: ''
-    05-plot-data-file: '05-nonexisting.csv'
-    05-plot-title: ''
-    05-plot-yaxis: ''
-    05-plot-group: ''
-    05-inclusion-flag: 'off'
-    05-exclude-value: ''
-    06-plot-data-file: '06-nonexisting.csv'
-    06-plot-title: ''
-    06-plot-yaxis: ''
-    06-plot-group: ''
-    06-inclusion-flag: 'off'
-    06-exclude-value: ''
-    07-plot-data-file: '07-nonexisting.csv'
-    07-plot-title: ''
-    07-plot-yaxis: ''
-    07-plot-group: ''
-    07-inclusion-flag: 'off'
-    07-exclude-value: ''
-    08-plot-data-file: '08-nonexisting.csv'
-    08-plot-title: ''
-    08-plot-yaxis: ''
-    08-plot-group: ''
-    08-inclusion-flag: 'off'
-    08-exclude-value: ''
-    09-plot-data-file: '09-nonexisting.csv'
-    09-plot-title: ''
-    09-plot-yaxis: ''
-    09-plot-group: ''
-    09-inclusion-flag: 'off'
-    09-exclude-value: ''
-    10-plot-data-file: '10-nonexisting.csv'
-    10-plot-title: ''
-    10-plot-yaxis: ''
-    10-plot-group: ''
-    10-inclusion-flag: 'off'
-    10-exclude-value: ''
+    01-plot-title: ""
+    01-plot-yaxis: ""
+    01-plot-group: "Default Plot Group"
+    01-plot-data-file: "plot-data.csv"
+    02-plot-title: ""
+    02-plot-yaxis: ""
+    02-plot-group: "Default Plot Group"
+    02-plot-data-file: "plot-data.csv"
+    03-plot-data-file: "03-nonexisting.csv"
+    03-plot-title: ""
+    03-plot-yaxis: ""
+    03-plot-group: ""
+    03-inclusion-flag: "off"
+    03-exclude-value: ""
+    04-plot-data-file: "04-nonexisting.csv"
+    04-plot-title: ""
+    04-plot-yaxis: ""
+    04-plot-group: ""
+    04-inclusion-flag: "off"
+    04-exclude-value: ""
+    05-plot-data-file: "05-nonexisting.csv"
+    05-plot-title: ""
+    05-plot-yaxis: ""
+    05-plot-group: ""
+    05-inclusion-flag: "off"
+    05-exclude-value: ""
+    06-plot-data-file: "06-nonexisting.csv"
+    06-plot-title: ""
+    06-plot-yaxis: ""
+    06-plot-group: ""
+    06-inclusion-flag: "off"
+    06-exclude-value: ""
+    07-plot-data-file: "07-nonexisting.csv"
+    07-plot-title: ""
+    07-plot-yaxis: ""
+    07-plot-group: ""
+    07-inclusion-flag: "off"
+    07-exclude-value: ""
+    08-plot-data-file: "08-nonexisting.csv"
+    08-plot-title: ""
+    08-plot-yaxis: ""
+    08-plot-group: ""
+    08-inclusion-flag: "off"
+    08-exclude-value: ""
+    09-plot-data-file: "09-nonexisting.csv"
+    09-plot-title: ""
+    09-plot-yaxis: ""
+    09-plot-group: ""
+    09-inclusion-flag: "off"
+    09-exclude-value: ""
+    10-plot-data-file: "10-nonexisting.csv"
+    10-plot-title: ""
+    10-plot-yaxis: ""
+    10-plot-group: ""
+    10-inclusion-flag: "off"
+    10-exclude-value: ""

 
     # Manual CSIT job lists used by sanity or periodic in nature.
     csit-mri-list-silicon: >
 
     # Manual CSIT job lists used by sanity or periodic in nature.
     csit-mri-list-silicon: >

-        controller-csit-1node-akka1-all-silicon,
-        controller-csit-1node-benchmark-all-silicon,
-        controller-csit-1node-rest-cars-perf-all-silicon,
-        controller-csit-3node-benchmark-all-silicon,
-        controller-csit-3node-clustering-ask-all-silicon,
-        controller-csit-3node-clustering-tell-all-silicon,
-        controller-csit-3node-rest-clust-cars-perf-ask-only-silicon,
-        controller-csit-3node-rest-clust-cars-perf-tell-only-silicon,
-        yangtools-csit-1node-system-only-silicon
+      controller-csit-1node-akka1-all-silicon,
+      controller-csit-1node-benchmark-all-silicon,
+      controller-csit-1node-rest-cars-perf-all-silicon,
+      controller-csit-3node-benchmark-all-silicon,
+      controller-csit-3node-clustering-ask-all-silicon,
+      controller-csit-3node-clustering-tell-all-silicon,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-silicon,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-silicon,
+      yangtools-csit-1node-system-only-silicon

     csit-mri-list-aluminium: >
     csit-mri-list-aluminium: >

-        controller-csit-1node-akka1-all-aluminium,
-        controller-csit-1node-benchmark-all-aluminium,
-        controller-csit-1node-rest-cars-perf-all-aluminium,
-        controller-csit-3node-benchmark-all-aluminium,
-        controller-csit-3node-clustering-ask-all-aluminium,
-        controller-csit-3node-clustering-tell-all-aluminium,
-        controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
-        controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
-        yangtools-csit-1node-system-only-aluminium
+      controller-csit-1node-akka1-all-aluminium,
+      controller-csit-1node-benchmark-all-aluminium,
+      controller-csit-1node-rest-cars-perf-all-aluminium,
+      controller-csit-3node-benchmark-all-aluminium,
+      controller-csit-3node-clustering-ask-all-aluminium,
+      controller-csit-3node-clustering-tell-all-aluminium,
+      controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
+      controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
+      yangtools-csit-1node-system-only-aluminium

     csit-mri-list-magnesium: >
     csit-mri-list-magnesium: >

-        yangtools-csit-1node-system-only-magnesium
+      yangtools-csit-1node-system-only-magnesium

     csit-mri-list-sodium: >
     csit-mri-list-sodium: >

-        yangtools-csit-1node-system-only-sodium
+      yangtools-csit-1node-system-only-sodium

     csit-sanity-list-silicon: >
     csit-sanity-list-silicon: >

-        openflowplugin-csit-1node-sanity-only-silicon,
-        distribution-sanity-silicon
+      openflowplugin-csit-1node-sanity-only-silicon,
+      distribution-sanity-silicon

     csit-sanity-list-aluminium: >
     csit-sanity-list-aluminium: >

-        openflowplugin-csit-1node-sanity-only-aluminium,
-        distribution-sanity-aluminium
+      openflowplugin-csit-1node-sanity-only-aluminium,
+      distribution-sanity-aluminium

     csit-sanity-list-magnesium: >
     csit-sanity-list-magnesium: >

-        openflowplugin-csit-1node-sanity-only-magnesium,
-        distribution-sanity-magnesium
+      openflowplugin-csit-1node-sanity-only-magnesium,
+      distribution-sanity-magnesium

     csit-sanity-list-sodium: >
     csit-sanity-list-sodium: >

-        openflowplugin-csit-1node-sanity-only-sodium,
-        distribution-sanity-sodium
+      openflowplugin-csit-1node-sanity-only-sodium,
+      distribution-sanity-sodium

     csit-weekly-list-silicon: >
     csit-weekly-list-silicon: >

-        controller-csit-1node-notifications-longevity-only-silicon,
-        controller-csit-3node-drb-partnheal-longevity-only-silicon,
-        controller-csit-3node-drb-precedence-longevity-only-silicon,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-silicon,
-        bgpcep-csit-3node-bgpclustering-longevity-only-silicon,
-        distribution-deploy-silicon,
-        distribution-offline-silicon,
-        openflowplugin-csit-1node-longevity-only-silicon
+      controller-csit-1node-notifications-longevity-only-silicon,
+      controller-csit-3node-drb-partnheal-longevity-only-silicon,
+      controller-csit-3node-drb-precedence-longevity-only-silicon,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-silicon,
+      bgpcep-csit-3node-bgpclustering-longevity-only-silicon,
+      distribution-deploy-silicon,
+      distribution-offline-silicon,
+      openflowplugin-csit-1node-longevity-only-silicon

     csit-weekly-list-aluminium: >
     csit-weekly-list-aluminium: >

-        controller-csit-1node-notifications-longevity-only-aluminium,
-        controller-csit-3node-drb-partnheal-longevity-only-aluminium,
-        controller-csit-3node-drb-precedence-longevity-only-aluminium,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-aluminium,
-        bgpcep-csit-3node-bgpclustering-longevity-only-aluminium,
-        distribution-deploy-aluminium,
-        distribution-offline-aluminium,
-        openflowplugin-csit-1node-longevity-only-aluminium
+      controller-csit-1node-notifications-longevity-only-aluminium,
+      controller-csit-3node-drb-partnheal-longevity-only-aluminium,
+      controller-csit-3node-drb-precedence-longevity-only-aluminium,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-aluminium,
+      bgpcep-csit-3node-bgpclustering-longevity-only-aluminium,
+      distribution-deploy-aluminium,
+      distribution-offline-aluminium,
+      openflowplugin-csit-1node-longevity-only-aluminium

     csit-weekly-list-magnesium: >
     csit-weekly-list-magnesium: >

-        controller-csit-1node-notifications-longevity-only-magnesium,
-        controller-csit-3node-drb-partnheal-longevity-only-magnesium,
-        controller-csit-3node-drb-precedence-longevity-only-magnesium,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-magnesium,
-        bgpcep-csit-3node-bgpclustering-longevity-only-magnesium,
-        distribution-deploy-magnesium,
-        distribution-offline-magnesium,
-        openflowplugin-csit-1node-longevity-only-magnesium
+      controller-csit-1node-notifications-longevity-only-magnesium,
+      controller-csit-3node-drb-partnheal-longevity-only-magnesium,
+      controller-csit-3node-drb-precedence-longevity-only-magnesium,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-magnesium,
+      bgpcep-csit-3node-bgpclustering-longevity-only-magnesium,
+      distribution-deploy-magnesium,
+      distribution-offline-magnesium,
+      openflowplugin-csit-1node-longevity-only-magnesium

     csit-weekly-list-sodium: >
     csit-weekly-list-sodium: >

-        controller-csit-1node-notifications-longevity-only-sodium,
-        controller-csit-3node-drb-partnheal-longevity-only-sodium,
-        controller-csit-3node-drb-precedence-longevity-only-sodium,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-sodium,
-        bgpcep-csit-3node-bgpclustering-longevity-only-sodium,
-        distribution-deploy-sodium,
-        distribution-offline-sodium,
-        openflowplugin-csit-1node-longevity-only-sodium
+      controller-csit-1node-notifications-longevity-only-sodium,
+      controller-csit-3node-drb-partnheal-longevity-only-sodium,
+      controller-csit-3node-drb-precedence-longevity-only-sodium,
+      controller-csit-3node-ddb-expl-lead-movement-longevity-only-sodium,
+      bgpcep-csit-3node-bgpclustering-longevity-only-sodium,
+      distribution-deploy-sodium,
+      distribution-offline-sodium,
+      openflowplugin-csit-1node-longevity-only-sodium

diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml
index 60c7a46c3c6485cbc61ab980ff4519af7204809c..d407270024fb68bcb584e68167b1edd2e0395f1a 100644 (file)
--- a/jjb/detnet/detnet.yaml
+++ b/jjb/detnet/detnet.yaml
@@ -2,7 +2,7 @@
 - project:
     name: detnet-silicon
     jobs:
 - project:
     name: detnet-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: detnet
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
           build-node: centos7-builder-2c-2g
           project-pattern: detnet
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/


@@ -11,14 +11,14 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'detnet'
-    project-name: 'detnet'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'detnet-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[detnet] [odlparent] [yangtools] [controller]'
+    project: "detnet"
+    project-name: "detnet"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "detnet-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[detnet] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -27,7 +27,7 @@
 - project:
     name: detnet-aluminium
     jobs:
 - project:
     name: detnet-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: detnet
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
           build-node: centos7-builder-2c-2g
           project-pattern: detnet
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/


@@ -36,14 +36,14 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'detnet'
-    project-name: 'detnet'
-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'detnet-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[detnet] [odlparent] [yangtools] [controller]'
+    project: "detnet"
+    project-name: "detnet"
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "detnet-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[detnet] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -52,7 +52,7 @@
 - project:
     name: detnet-magnesium
     jobs:
 - project:
     name: detnet-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: detnet
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
           build-node: centos7-builder-2c-2g
           project-pattern: detnet
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/


@@ -61,14 +61,14 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'detnet'
-    project-name: 'detnet'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'detnet-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[detnet] [odlparent] [yangtools] [controller]'
+    project: "detnet"
+    project-name: "detnet"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "detnet-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[detnet] [odlparent] [yangtools] [controller]"

     build-node: centos7-docker-2c-8g
 
     # Used by the release job
     build-node: centos7-docker-2c-8g
 
     # Used by the release job


@@ -93,15 +93,15 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'detnet'
-    project-name: 'detnet'
-    branch: 'master'
-    mvn-settings: 'detnet-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "detnet"
+    project-name: "detnet"
+    branch: "master"
+    mvn-settings: "detnet-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: detnet-info
 
 - project:
     name: detnet-info

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 25289309cae3273b4fedca599ed25e7630111f03..68e1038b8a1f294b644b4451e54330ddece012e6 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -6,13 +6,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'dlux-settings'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
+    project: "dlux"
+    project-name: "dlux"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "dlux-settings"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[dlux] [odlparent]"

 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f


@@ -24,12 +24,12 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/sodium'
-    mvn-settings: 'dlux-settings'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
+    project: "dlux"
+    project-name: "dlux"
+    branch: "stable/sodium"
+    mvn-settings: "dlux-settings"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[dlux] [odlparent]"

 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f


@@ -49,15 +49,15 @@
     name: dlux-sonar
     jobs:
       - gerrit-maven-sonar
     name: dlux-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'master'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "dlux"
+    project-name: "dlux"
+    branch: "master"
+    mvn-settings: "dlux-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: dlux-info
 
 - project:
     name: dlux-info

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index ba6e33cb3f642f3a97bbcb3da439fff19e1debc6..870652eacd5da8fd4037415cdeeab20c6a42535e 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -6,32 +6,32 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'dluxapps'
+    project: "dluxapps"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'yangman'
+    functionality: "yangman"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-dluxapps-yangman'
+    install-features: "odl-dluxapps-yangman"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 1580b9af50def099179b89233b44be6045c60170..230b17eed54ef3c7766240dbbf6e3d517efd84f4 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -5,15 +5,15 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    project: 'dluxapps'
-    project-name: 'dluxapps'
+    project: "dluxapps"
+    project-name: "dluxapps"

     stream: silicon
     stream: silicon

-    branch: 'master'
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    mvn-settings: "dluxapps-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[dluxapps] [odlparent] [yangtools] [controller]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -25,15 +25,15 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    project: 'dluxapps'
-    project-name: 'dluxapps'
+    project: "dluxapps"
+    project-name: "dluxapps"

     stream: aluminium
     stream: aluminium

-    branch: 'stable/aluminium'
+    branch: "stable/aluminium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    mvn-settings: "dluxapps-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[dluxapps] [odlparent] [yangtools] [controller]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -45,15 +45,15 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    project: 'dluxapps'
-    project-name: 'dluxapps'
+    project: "dluxapps"
+    project-name: "dluxapps"

     stream: magnesium
     stream: magnesium

-    branch: 'stable/magnesium'
+    branch: "stable/magnesium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    mvn-settings: "dluxapps-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[dluxapps] [odlparent] [yangtools] [controller]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -65,15 +65,15 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    project: 'dluxapps'
-    project-name: 'dluxapps'
+    project: "dluxapps"
+    project-name: "dluxapps"

     stream: sodium
     stream: sodium

-    branch: 'stable/sodium'
+    branch: "stable/sodium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    mvn-settings: "dluxapps-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[dluxapps] [odlparent] [yangtools] [controller]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -95,16 +95,16 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    branch: 'master'
+    project: "dluxapps"
+    project-name: "dluxapps"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "dluxapps-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: dluxapps-info
 
 - project:
     name: dluxapps-info

diff --git a/jjb/docs/docs-projects.yaml b/jjb/docs/docs-projects.yaml
index 09838c747b4d5ad793ab73a19be27c80730ecf01..e24a45bfc4c64aee42de07e397766d9c69313bbd 100644 (file)
--- a/jjb/docs/docs-projects.yaml
+++ b/jjb/docs/docs-projects.yaml
@@ -2,12 +2,12 @@
 - project:
     name: docs-update-{stream}
     jobs:
 - project:
     name: docs-update-{stream}
     jobs:

-      - 'docs-update-{stream}'
+      - "docs-update-{stream}"

     stream:
       - master:
     stream:
       - master:

-          branch: 'master'
+          branch: "master"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

     build-node: centos7-builder-2c-2g
     build-node: centos7-builder-2c-2g

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index f38dae0fdfa28553ccafb71f858a2fdc30ea390a..ed2bb9178b6af3798c7384230dccec4bad8210ba 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -2,18 +2,18 @@
 - project:
     name: docs-rtd
     jobs:
 - project:
     name: docs-rtd
     jobs:

-      - '{project-name}-rtd-jobs'
+      - "{project-name}-rtd-jobs"

       - gerrit-tox-verify
 
     stream:
       - silicon:
       - gerrit-tox-verify
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     project: docs
     project-name: docs
 
     project: docs
     project-name: docs

diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml
index 5c8a35bf91acebd8ea8954ab17a43adf60db0ea9..c367eae10c546d7b7adbb3cecb165c96b00ad7f8 100644 (file)
--- a/jjb/docs/docs-template.yaml
+++ b/jjb/docs/docs-template.yaml
@@ -1,12 +1,12 @@
 ---
 # Autorelease build jobs
 - job-template:
 ---
 # Autorelease build jobs
 - job-template:

-    name: 'docs-update-{stream}'
+    name: "docs-update-{stream}"

 
     ######################
     # Default parameters #
     ######################
 
     ######################
     # Default parameters #
     ######################

-    disable-job: 'false'
+    disable-job: "false"

 
     #####################
     # Job Configuration #
 
     #####################
     # Job Configuration #


@@ -14,7 +14,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-2g
 
     project-type: freestyle
     node: centos7-builder-2c-2g

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - lf-infra-properties:
 
     properties:
       - lf-infra-properties:


@@ -22,38 +22,38 @@
 
     parameters:
       - lf-infra-parameters:
 
     parameters:
       - lf-infra-parameters:

-          project: 'releng/autorelease'
-          project-name: 'autorelease'
-          branch: '{branch}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
+          project: "releng/autorelease"
+          project-name: "autorelease"
+          branch: "{branch}"
+          stream: "{stream}"
+          lftools-version: "{lftools-version}"

       - string:
           name: RELEASE_NAME
       - string:
           name: RELEASE_NAME

-          description: 'The next release name eg Magnesium'
+          description: "The next release name eg Magnesium"

       - bool:
           name: PUBLISH
           default: false
       - bool:
           name: PUBLISH
           default: false

-          description: 'The flag to publish or not'
+          description: "The flag to publish or not"

 
     scm:
       - lf-gerrit-clone:
 
     scm:
       - lf-gerrit-clone:

-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          branch: '$GERRIT_BRANCH'
-          refspec: '$GERRIT_REFSPEC'
+          git-url: "$GIT_URL/$GERRIT_PROJECT"
+          branch: "$GERRIT_BRANCH"
+          refspec: "$GERRIT_REFSPEC"

           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10

-          basedir: 'autorelease'
+          basedir: "autorelease"

           choosing-strategy: default
           wipe-workspace: true
       - lf-gerrit-clone:
           choosing-strategy: default
           wipe-workspace: true
       - lf-gerrit-clone:

-          git-url: '$GIT_URL/docs'
-          branch: '$GERRIT_BRANCH'
-          refspec: '$GERRIT_REFSPEC'
+          git-url: "$GIT_URL/docs"
+          branch: "$GERRIT_BRANCH"
+          refspec: "$GERRIT_REFSPEC"

           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: true
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-disable: true

-          basedir: 'docs'
+          basedir: "docs"

           submodule-recursive: false
           submodule-timeout: 10
           choosing-strategy: default
           submodule-recursive: false
           submodule-timeout: 10
           choosing-strategy: default

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 46bdaec6c5f85ed2500fb017261ad54b47cd8bcd..f4df8dc32b27258bc4550f4a0a03f810e99d1f44 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -5,34 +5,34 @@
       - inttest-csit-1node-custom
       - inttest-csit-3node-custom
 
       - inttest-csit-1node-custom
       - inttest-csit-3node-custom
 

-    project: 'genius'
+    project: "genius"

 
     functionality:
 
     functionality:

-      - 'upstream'
-      - 'gate'
-      - 'tdd-wip':
-          testplan: '{project}-tdd-wip.txt'
+      - "upstream"
+      - "gate"
+      - "tdd-wip":
+          testplan: "{project}-tdd-wip.txt"

 
 

-    testplan: '{project}-{functionality}.txt'
+    testplan: "{project}-{functionality}.txt"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     tools_system_count: 3
 
 
     tools_system_count: 3
 

-    install-features: 'odl-genius-rest'
-    robot-options: '-v FAIL_ON_EXCEPTIONS:False'
+    install-features: "odl-genius-rest"
+    robot-options: "-v FAIL_ON_EXCEPTIONS:False"

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 7cd7e09b557dfcb7f38b2ab5d26da3cd71a21a5b..b70baf3fe3ebe69a2b71a19220b0e549f36e6937 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -4,44 +4,44 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'genius'
+    project: "genius"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
+    os-branch: "queens"

 
     feature:
       - netvirt:
           csit-list: >
 
     feature:
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - netvirt-itm-direct-tunnels:
           csit-list: >
 
       - netvirt-itm-direct-tunnels:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

 
       - cluster:
           csit-list: >
 
       - cluster:
           csit-list: >

-              genius-csit-3node-gate-only-{stream}
+            genius-csit-3node-gate-only-{stream}

 
       - tdd-wip:
           csit-list: >
 
       - tdd-wip:
           csit-list: >

-              genius-csit-1node-tdd-wip-only-{stream}
+            genius-csit-1node-tdd-wip-only-{stream}

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index fef37c5d7599da06678a4ab59bfe78b8fbf6f713..e94a0e0627c3bfa5ce29ceeae5a55a2f0385d3db 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -2,9 +2,9 @@
 - project:
     name: genius-silicon
     jobs:
 - project:
     name: genius-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/


@@ -12,25 +12,25 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: silicon
     block_on_csit: false
 
     stream: silicon

-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
+    project: "genius"
+    project-name: "genius"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "genius-settings"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream}
+    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"

 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee


@@ -38,9 +38,9 @@
 - project:
     name: genius-aluminium
     jobs:
 - project:
     name: genius-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/


@@ -48,25 +48,25 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: aluminium
     block_on_csit: false
 
     stream: aluminium

-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/aluminium'
+    project: "genius"
+    project-name: "genius"
+    branch: "stable/aluminium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "genius-settings"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream}
+    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"

 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee


@@ -74,9 +74,9 @@
 - project:
     name: genius-magnesium
     jobs:
 - project:
     name: genius-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/


@@ -84,25 +84,25 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: magnesium
     block_on_csit: false
 
     stream: magnesium

-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/magnesium'
+    project: "genius"
+    project-name: "genius"
+    branch: "stable/magnesium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "genius-settings"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream}
+    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"

 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee


@@ -110,9 +110,9 @@
 - project:
     name: genius-sodium
     jobs:
 - project:
     name: genius-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/


@@ -120,24 +120,24 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: sodium
     block_on_csit: false
 
     stream: sodium

-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/sodium'
+    project: "genius"
+    project-name: "genius"
+    branch: "stable/sodium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "genius-settings"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream}
+    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"

 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee


@@ -146,17 +146,17 @@
     name: genius-sonar
     jobs:
       - gerrit-maven-sonar
     name: genius-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
+    project: "genius"
+    project-name: "genius"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "genius-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: genius-info
 
 - project:
     name: genius-info

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 13c242ea5c1079c502e40c53d0bfb4fd71bebe39..264a3a018a2bc82fbb254bf28a7df8b84c8c8d5d 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -5,40 +5,40 @@
       - inttest-csit-openstack-custom
 
     # The project name
       - inttest-csit-openstack-custom
 
     # The project name

-    project: 'groupbasedpolicy'
+    project: "groupbasedpolicy"

     disable-job: true
 
     topology:
       - 1node:
           openstack_system_count: 1
           odl_system_count: 1
     disable-job: true
 
     topology:
       - 1node:
           openstack_system_count: 1
           odl_system_count: 1

-          enable-haproxy: 'no'
+          enable-haproxy: "no"

 
 

-    testplan: '{project}-{topology}-openstack.txt'
+    testplan: "{project}-{topology}-openstack.txt"

 
     # The project name
 
     # The project name

-    functionality: 'openstack'
+    functionality: "openstack"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     openstack:
       - queens:
 
     openstack:
       - queens:

-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
+          openstack-branch: "stable/queens"
+          odl-ml2-branch: "stable/queens"

 
 

-    public-bridge: 'br-int'
+    public-bridge: "br-int"

 
 

-    enable-openstack-plugins: 'networking-odl'
+    enable-openstack-plugins: "networking-odl"

 
 

-    security-group-mode: 'none'
+    security-group-mode: "none"

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index d84f74ae8bff736d26f51779bafe11c66c343ef9..bf6305a08fee89b115b79e19c468b5fb4c2a9fa4 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -5,36 +5,36 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'groupbasedpolicy'
+    project: "groupbasedpolicy"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: '3-node'
+    functionality: "3-node"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
     tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431
 
     # Features to install
 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
     tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431
 
     # Features to install

-    install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
+    install-features: "odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index de96bd68535d45e35c812452343bd7c03b8df2b0..2da966ce37ede941517b9b964a4b47ab5d76d594 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -4,31 +4,30 @@
     jobs:
       - inttest-csit-1node
 
     jobs:
       - inttest-csit-1node
 

-

     # The project name
     # The project name

-    project: 'groupbasedpolicy'
+    project: "groupbasedpolicy"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: '6node'
+    functionality: "6node"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6


@@ -36,9 +35,9 @@
 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-groupbasedpolicy-ofoverlay,
-        odl-groupbasedpolicy-ui,
-        odl-restconf-all
+      odl-groupbasedpolicy-ofoverlay,
+      odl-groupbasedpolicy-ui,
+      odl-restconf-all

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 2738d89ba0c6880463c91cd3a1ec9bfd07ab4bec..76f07162760f8c251a706573325953fed1d94aa5 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -4,37 +4,36 @@
     jobs:
       - inttest-csit-3node
 
     jobs:
       - inttest-csit-3node
 

-

     # The project name
     # The project name

-    project: 'groupbasedpolicy'
+    project: "groupbasedpolicy"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'clustering'
+    functionality: "clustering"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-groupbasedpolicy-ofoverlay,
-        odl-groupbasedpolicy-ui,
-        odl-restconf-all
+      odl-groupbasedpolicy-ofoverlay,
+      odl-groupbasedpolicy-ui,
+      odl-restconf-all

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index 0c9a9052e49bfadbb7cdbc3e17f0faef652745eb..2ac02f62f1cf946b1866b4a2a6e444620bb6d9b2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -4,41 +4,41 @@
     jobs:
       - inttest-csit-1node
     # The project name
     jobs:
       - inttest-csit-1node
     # The project name

-    project: 'groupbasedpolicy'
+    project: "groupbasedpolicy"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'sxp'
+    functionality: "sxp"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Mininet configuration (TOOLS)
     tools_system_count: 2
 
     # Features to install
     install-features: >
 
     # Mininet configuration (TOOLS)
     tools_system_count: 2
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-groupbasedpolicy-sxp-ise-adapter,
-        odl-groupbasedpolicy-ne-location-provider,
-        odl-groupbasedpolicy-ios-xe,
-        odl-sfc-ios-xe-renderer,
-        odl-sxp-controller
+      odl-restconf,
+      odl-groupbasedpolicy-sxp-ise-adapter,
+      odl-groupbasedpolicy-ne-location-provider,
+      odl-groupbasedpolicy-ios-xe,
+      odl-sfc-ios-xe-renderer,
+      odl-sxp-controller

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index a336384ced2c0b1aa69ea569e891b97aedf87f0f..2bb19cc5166dee3e1c35ef2f7ba84a8a6a9222cb 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -6,21 +6,21 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'master'
+    project: "groupbasedpolicy"
+    project-name: "groupbasedpolicy"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "groupbasedpolicy-settings"
+    mvn-goals: "-U clean deploy findbugs:findbugs"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream},
+      sfc-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -33,21 +33,21 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/aluminium'
+    project: "groupbasedpolicy"
+    project-name: "groupbasedpolicy"
+    branch: "stable/aluminium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "groupbasedpolicy-settings"
+    mvn-goals: "-U clean deploy findbugs:findbugs"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream},
+      sfc-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -60,21 +60,21 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/magnesium'
+    project: "groupbasedpolicy"
+    project-name: "groupbasedpolicy"
+    branch: "stable/magnesium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "groupbasedpolicy-settings"
+    mvn-goals: "-U clean deploy findbugs:findbugs"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream},
+      sfc-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -87,21 +87,21 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/sodium'
+    project: "groupbasedpolicy"
+    project-name: "groupbasedpolicy"
+    branch: "stable/sodium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "groupbasedpolicy-settings"
+    mvn-goals: "-U clean deploy findbugs:findbugs"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream},
+      sfc-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream: "[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -122,18 +122,18 @@
     name: groupbasedpolicy-sonar
     jobs:
       - gerrit-maven-sonar
     name: groupbasedpolicy-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'master'
+    project: "groupbasedpolicy"
+    project-name: "groupbasedpolicy"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "groupbasedpolicy-settings"
+    mvn-goals: "-U clean deploy findbugs:findbugs"
+    mvn-opts: "-Xmx1024m"

     disable-job: true
     sonarcloud: true
     disable-job: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: groupbasedpolicy-info
 
 - project:
     name: groupbasedpolicy-info

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index a163fa3c44b53a764847962f43ae2695aeee00ea..502454d912ddf0de5bfa08e502178b4fd08a2171 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -6,12 +6,12 @@
       - odl-maven-verify-jobs
 
     stream: master
       - odl-maven-verify-jobs
 
     stream: master

-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'master'
-    mvn-settings: 'honeycomb-vbd-settings'
-    dependencies: ''
-    email-upstream: '[vbd]'
+    project: "honeycomb/vbd"
+    project-name: "vbd"
+    branch: "master"
+    mvn-settings: "honeycomb-vbd-settings"
+    dependencies: ""
+    email-upstream: "[vbd]"

 
     # Used by the release job
     staging-profile-id: 96fc362c36862
 
     # Used by the release job
     staging-profile-id: 96fc362c36862


@@ -31,15 +31,15 @@
     name: vbd-sonar
     jobs:
       - gerrit-maven-sonar
     name: vbd-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'master'
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "honeycomb/vbd"
+    project-name: "vbd"
+    branch: "master"
+    mvn-settings: "honeycomb-vbd-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: vbd-info
 
 - project:
     name: vbd-info

diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
index 638b1621d80666864550d0193260a8afcad44986..14f6227c665d1667123af784dc9e0b479962d4e5 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -4,37 +4,37 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'infrautils'
+    project: "infrautils"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
-    jdk: 'openjdk8'
+    os-branch: "queens"
+    jdk: "openjdk8"

 
     feature:
       - netvirt:
           csit-list: >
 
     feature:
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

 
       - genius-cluster:
           csit-list: >
 
       - genius-cluster:
           csit-list: >

-              genius-csit-3node-gate-only-{stream}
+            genius-csit-3node-gate-only-{stream}

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d156c1eaac540eeaa0065b2ff36771e48384c966..e960ea1910d994c298519d85a24f7737ce8e3e4a 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -2,7 +2,7 @@
 - project:
     name: infrautils-master
     jobs:
 - project:
     name: infrautils-master
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils


@@ -12,14 +12,14 @@
       - odl-maven-verify-jobs
 
     stream: master
       - odl-maven-verify-jobs
 
     stream: master

-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "infrautils-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[infrautils] [odlparent]"

 
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
     # Used by the release job
     staging-profile-id: 96fca0367756c


@@ -27,9 +27,9 @@
 - project:
     name: infrautils-magnesium
     jobs:
 - project:
     name: infrautils-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils


@@ -39,14 +39,14 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "infrautils-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[infrautils] [odlparent]"

 
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
     # Used by the release job
     staging-profile-id: 96fca0367756c


@@ -54,9 +54,9 @@
 - project:
     name: infrautils-sodium
     jobs:
 - project:
     name: infrautils-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils


@@ -66,13 +66,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/sodium'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "stable/sodium"
+    mvn-settings: "infrautils-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[infrautils] [odlparent]"

 
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
     # Used by the release job
     staging-profile-id: 96fca0367756c


@@ -92,16 +92,16 @@
     name: infrautils-sonar
     jobs:
       - gerrit-maven-sonar
     name: infrautils-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "infrautils-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: infrautils-info
 
 - project:
     name: infrautils-info

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 9e7d9e6fcc91d7f218d9eab4bc37d39bc617a7ae..8427aaf683f60c365de3df8b2ccf72903a100629 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -5,31 +5,31 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'distribution'
+    project: "distribution"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'userfeatures'
+    functionality: "userfeatures"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-topology,odl-jolokia'
+    install-features: "odl-restconf,odl-distribution-version,odl-netconf-topology,odl-jolokia"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 32314b263266c9c44b440000563b138798d7fb53..0fdb9d5593dc955b7f898afdc3c6e56fc4cb2ddd 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -3,11 +3,11 @@
     name: distribution
     jobs:
       # gerrit- is generic template, distribution- is project specific.
     name: distribution
     jobs:
       # gerrit- is generic template, distribution- is project specific.

-      - 'distribution-sanity-{stream}'
+      - "distribution-sanity-{stream}"

       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
       - gerrit-tox-verify
       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
       - gerrit-tox-verify

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           project-pattern: integration/distribution
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/
           rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944
           project-pattern: integration/distribution
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/
           rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944


@@ -15,176 +15,176 @@
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings

-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m'
+    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
+    mvn-opts: "-Xmx1024m"

     nexus-iq-namespace: odl-
     nexus-iq-stage: release
     nexus-iq-namespace: odl-
     nexus-iq-stage: release

-    email-upstream: '[int/dist]'
+    email-upstream: "[int/dist]"

     stream:
       - silicon:
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

           java-version: openjdk11
           java-version: openjdk11

-          jre: 'openjdk11'
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

           java-version: openjdk11
           java-version: openjdk11

-          jre: 'openjdk11'
+          jre: "openjdk11"

           karaf-version: odl
       - magnesium:
           karaf-version: odl
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

           java-version: openjdk11
           java-version: openjdk11

-          jre: 'openjdk11'
+          jre: "openjdk11"

           karaf-version: odl
       - sodium:
           karaf-version: odl
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >

-              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
+            mvn:org.opendaylight.transportpce/features-transportpce//xml/features

           sm-features: >
           sm-features: >

-              odl-transportpce,
-              odl-transportpce-api,
-              odl-transportpce-ordmodels
+            odl-transportpce,
+            odl-transportpce-api,
+            odl-transportpce-ordmodels

 
 - project:
     name: distribution-managed
     jobs:
       # gerrit- is generic template, distribution- is project specific.
 
 - project:
     name: distribution-managed
     jobs:
       # gerrit- is generic template, distribution- is project specific.

-      - 'distribution-merge-{type}-{stream}'
-      - 'distribution-verify-{type}-{stream}'
-      - 'distribution-check-{type}-{stream}'
-      - 'distribution-csit-managed-{stream}'
+      - "distribution-merge-{type}-{stream}"
+      - "distribution-verify-{type}-{stream}"
+      - "distribution-check-{type}-{stream}"
+      - "distribution-csit-managed-{stream}"

 
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings
 
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings

-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m'
-    email-upstream: '[int/dist]'
+    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
+    mvn-opts: "-Xmx1024m"
+    email-upstream: "[int/dist]"

     type: managed
     type: managed

-    profile: '-Pmanaged'
-    forbidden-files: 'opendaylight/**'
+    profile: "-Pmanaged"
+    forbidden-files: "opendaylight/**"

     karaf-version: karaf4
     karaf-version: karaf4

-    dist-pom: 'distribution/pom.xml'
+    dist-pom: "distribution/pom.xml"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
-          jre: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"
+          jre: "openjdk11"

           dependencies: >
           dependencies: >

-              aaa-maven-merge-{stream},
-              bgpcep-maven-merge-{stream},
-              daexim-maven-merge-{stream},
-              genius-maven-merge-{stream},
-              jsonrpc-maven-merge-{stream},
-              lispflowmapping-maven-merge-{stream},
-              netconf-maven-merge-{stream},
-              netvirt-maven-merge-{stream}
-              neutron-maven-merge-{stream},
-              openflowplugin-maven-merge-{stream},
-              ovsdb-maven-merge-{stream},
-              serviceutils-maven-merge-{stream},
+            aaa-maven-merge-{stream},
+            bgpcep-maven-merge-{stream},
+            daexim-maven-merge-{stream},
+            genius-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            netconf-maven-merge-{stream},
+            netvirt-maven-merge-{stream}
+            neutron-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"
+          jre: "openjdk11"

           dependencies: >
           dependencies: >

-              aaa-maven-merge-{stream},
-              bgpcep-maven-merge-{stream},
-              daexim-maven-merge-{stream},
-              genius-maven-merge-{stream},
-              jsonrpc-maven-merge-{stream},
-              lispflowmapping-maven-merge-{stream},
-              netconf-maven-merge-{stream},
-              netvirt-maven-merge-{stream}
-              neutron-maven-merge-{stream},
-              openflowplugin-maven-merge-{stream},
-              ovsdb-maven-merge-{stream},
-              serviceutils-maven-merge-{stream},
+            aaa-maven-merge-{stream},
+            bgpcep-maven-merge-{stream},
+            daexim-maven-merge-{stream},
+            genius-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            netconf-maven-merge-{stream},
+            netvirt-maven-merge-{stream}
+            neutron-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"
+          jre: "openjdk11"

           dependencies: >
           dependencies: >

-              aaa-maven-merge-{stream},
-              bgpcep-maven-merge-{stream},
-              controller-maven-merge-{stream},
-              daexim-maven-merge-{stream},
-              genius-maven-merge-{stream},
-              infrautils-maven-merge-{stream},
-              jsonrpc-maven-merge-{stream},
-              lispflowmapping-maven-merge-{stream},
-              netconf-maven-merge-{stream},
-              netvirt-maven-merge-{stream}
-              neutron-maven-merge-{stream},
-              openflowplugin-maven-merge-{stream},
-              ovsdb-maven-merge-{stream},
-              serviceutils-maven-merge-{stream},
+            aaa-maven-merge-{stream},
+            bgpcep-maven-merge-{stream},
+            controller-maven-merge-{stream},
+            daexim-maven-merge-{stream},
+            genius-maven-merge-{stream},
+            infrautils-maven-merge-{stream},
+            jsonrpc-maven-merge-{stream},
+            lispflowmapping-maven-merge-{stream},
+            netconf-maven-merge-{stream},
+            netvirt-maven-merge-{stream}
+            neutron-maven-merge-{stream},
+            openflowplugin-maven-merge-{stream},
+            ovsdb-maven-merge-{stream},
+            serviceutils-maven-merge-{stream},

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

           dependencies: >
           dependencies: >

-              aaa-merge-{stream},
-              bgpcep-merge-{stream},
-              coe-merge-{stream},
-              controller-merge-{stream},
-              daexim-merge-{stream},
-              genius-merge-{stream},
-              infrautils-merge-{stream},
-              lispflowmapping-merge-{stream},
-              netconf-merge-{stream},
-              netvirt-merge-{stream}
-              neutron-merge-{stream},
-              openflowplugin-merge-{stream},
-              ovsdb-merge-{stream},
-              serviceutils-merge-{stream},
-              sfc-merge-{stream}
+            aaa-merge-{stream},
+            bgpcep-merge-{stream},
+            coe-merge-{stream},
+            controller-merge-{stream},
+            daexim-merge-{stream},
+            genius-merge-{stream},
+            infrautils-merge-{stream},
+            lispflowmapping-merge-{stream},
+            netconf-merge-{stream},
+            netvirt-merge-{stream}
+            neutron-merge-{stream},
+            openflowplugin-merge-{stream},
+            ovsdb-merge-{stream},
+            serviceutils-merge-{stream},
+            sfc-merge-{stream}

 
 - project:
     name: distribution-full
     jobs:
       # gerrit- is generic template, distribution- is project specific.
 
 - project:
     name: distribution-full
     jobs:
       # gerrit- is generic template, distribution- is project specific.

-      - 'distribution-merge-{type}-{stream}'
-      - 'distribution-verify-{type}-{stream}'
-      - 'distribution-check-{type}-{stream}'
+      - "distribution-merge-{type}-{stream}"
+      - "distribution-verify-{type}-{stream}"
+      - "distribution-check-{type}-{stream}"

 
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings
 
     project: integration/distribution
     project-name: distribution
     mvn-settings: integration-distribution-settings

-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m'
-    email-upstream: '[int/dist]'
+    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
+    mvn-opts: "-Xmx1024m"
+    email-upstream: "[int/dist]"

     type: full
     type: full

-    profile: '-Punmanaged'
-    files: 'opendaylight/**'
+    profile: "-Punmanaged"
+    files: "opendaylight/**"

     karaf-version: odl
     karaf-version: odl

-    dist-pom: 'distribution/opendaylight/pom.xml'
+    dist-pom: "distribution/opendaylight/pom.xml"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

           karaf-version: odl
           dependencies: >
           karaf-version: odl
           dependencies: >

-              distribution-merge-managed-{stream},
+            distribution-merge-managed-{stream},

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

           karaf-version: odl
           dependencies: >
           karaf-version: odl
           dependencies: >

-              distribution-merge-managed-{stream},
+            distribution-merge-managed-{stream},

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

           karaf-version: odl
           dependencies: >
           karaf-version: odl
           dependencies: >

-              distribution-merge-managed-{stream},
+            distribution-merge-managed-{stream},

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

           karaf-version: odl
           dependencies: >
           karaf-version: odl
           dependencies: >

-              distribution-merge-managed-{stream},
-              transportpce-merge-{stream}
+            distribution-merge-managed-{stream},
+            transportpce-merge-{stream}

 
 - project:
     name: distribution-release
 
 - project:
     name: distribution-release


@@ -193,28 +193,28 @@
           sign-artifacts: true
       - gerrit-release-merge
 
           sign-artifacts: true
       - gerrit-release-merge
 

-    project: 'integration/distribution'
-    project-name: 'distribution'
-    mvn-goals: 'clean deploy -f opendaylight/pom.xml'
-    mvn-settings: 'integration-distribution-settings'
-    mvn-opts: '-Xmx1024m'
-    email-upstream: '[int/dist]'
+    project: "integration/distribution"
+    project-name: "distribution"
+    mvn-goals: "clean deploy -f opendaylight/pom.xml"
+    mvn-settings: "integration-distribution-settings"
+    mvn-opts: "-Xmx1024m"
+    email-upstream: "[int/dist]"

 
     # Used by the release job
     staging-profile-id: 2af042ed81d5e2
 
     stream:
       - silicon:
 
     # Used by the release job
     staging-profile-id: 2af042ed81d5e2
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 - project:
     name: distribution-sonar
 
 - project:
     name: distribution-sonar


@@ -224,18 +224,18 @@
     project: integration/distribution
     project-name: distribution
     branch: master
     project: integration/distribution
     project-name: distribution
     branch: master

-    java-version: 'openjdk11'
+    java-version: "openjdk11"

     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt

-    mvn-opts: '-Xmx1024m'
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: distribution-view
     views:
       - common-view
     view-name: distribution
 
 - project:
     name: distribution-view
     views:
       - common-view
     view-name: distribution

-    view-regex: '^(integration-)?distribution-.*'
+    view-regex: "^(integration-)?distribution-.*"

diff --git a/jjb/integration/distribution/distribution-macros.yaml b/jjb/integration/distribution/distribution-macros.yaml
index 474e9a6d480d2d5afdcf96d3e4b3ffda1d7388a2..974382e2f29269c01dc9ae990a76f15db9456c92 100644 (file)
--- a/jjb/integration/distribution/distribution-macros.yaml
+++ b/jjb/integration/distribution/distribution-macros.yaml
@@ -37,19 +37,19 @@
     #   pom: Relative path to pom file to use. Typically '$GERRIT_PROJECT/pom.xml'.
     builders:
       - maven-target:
     #   pom: Relative path to pom file to use. Typically '$GERRIT_PROJECT/pom.xml'.
     builders:
       - maven-target:

-          maven-version: '{mvn-version}'
-          pom: '{pom}'
+          maven-version: "{mvn-version}"
+          pom: "{pom}"

           goals: |
           goals: |

-              clean deploy
-              dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
-              -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
-              {mvn-opts}
+            clean deploy
+            dependency:tree -DoutputFile=dependency_tree.txt
+            -Pq
+            -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
+            {mvn-opts}

           java-opts:
           java-opts:

-            - '-Xmx4096m -Dmaven.compile.fork=true'
-          settings: 'integration-settings'
+            - "-Xmx4096m -Dmaven.compile.fork=true"
+          settings: "integration-settings"

           settings-type: cfp
           settings-type: cfp

-          global-settings: 'global-settings'
+          global-settings: "global-settings"

           global-settings-type: cfp
 
 - builder:
           global-settings-type: cfp
 
 - builder:


@@ -89,18 +89,18 @@
     #   dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
     builders:
       - maven-target:
     #   dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
     builders:
       - maven-target:

-          maven-version: '{mvn-version}'
-          pom: '{dist-pom}'
+          maven-version: "{mvn-version}"
+          pom: "{dist-pom}"

           goals: |
           goals: |

-              clean install
-              dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
-              {mvn-opts}
+            clean install
+            dependency:tree -DoutputFile=dependency_tree.txt
+            -Pq
+            {mvn-opts}

           java-opts:
           java-opts:

-            - '-Xmx1024m -Dmaven.compile.fork=true'
-          settings: 'integration-settings'
+            - "-Xmx1024m -Dmaven.compile.fork=true"
+          settings: "integration-settings"

           settings-type: cfp
           settings-type: cfp

-          global-settings: 'global-settings'
+          global-settings: "global-settings"

           global-settings-type: cfp
 
 - builder:
           global-settings-type: cfp
 
 - builder:


@@ -193,16 +193,16 @@
       - shell: |
           cp -r /tmp/r /tmp/t
       - maven-target:
       - shell: |
           cp -r /tmp/r /tmp/t
       - maven-target:

-          maven-version: '{mvn-version}'
-          pom: '{pom}'
+          maven-version: "{mvn-version}"
+          pom: "{pom}"

           goals: |
           goals: |

-              clean install
-              dependency:tree -DoutputFile=dependency_tree.txt
-              -s fake_remotes.xml
-              -Pq
-              {mvn-opts}
+            clean install
+            dependency:tree -DoutputFile=dependency_tree.txt
+            -s fake_remotes.xml
+            -Pq
+            {mvn-opts}

           java-opts:
           java-opts:

-            - '-Xmx4096m -Dmaven.compile.fork=true'
+            - "-Xmx4096m -Dmaven.compile.fork=true"

       - shell: |
           rm -rf /tmp/r
           mv /tmp/t /tmp/r
       - shell: |
           rm -rf /tmp/r
           mv /tmp/t /tmp/r


@@ -219,18 +219,18 @@
     #   dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
     builders:
       - maven-target:
     #   dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
     builders:
       - maven-target:

-          maven-version: '{mvn-version}'
-          pom: '{dist-pom}'
+          maven-version: "{mvn-version}"
+          pom: "{dist-pom}"

           goals: |
           goals: |

-              clean install
-              dependency:tree -DoutputFile=dependency_tree.txt
-              -s fake_remotes.xml
-              -Pq
-              -Dsft.heap.max=4g
-              -DskipTests=false
-              {mvn-opts}
+            clean install
+            dependency:tree -DoutputFile=dependency_tree.txt
+            -s fake_remotes.xml
+            -Pq
+            -Dsft.heap.max=4g
+            -DskipTests=false
+            {mvn-opts}

           java-opts:
           java-opts:

-            - '-Xmx1024m -Dmaven.compile.fork=true'
+            - "-Xmx1024m -Dmaven.compile.fork=true"

 
 - builder:
     name: distribution-check-warn-9191
 
 - builder:
     name: distribution-check-warn-9191

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index b7019f85492e06c48f1160bd88820ba3061593a2..477735a4f9d52fcef0fc7946cec9ad065accbc84 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -1,19 +1,19 @@
 ---
 - job-template:
 ---
 - job-template:

-    name: '{project-name}-distribution-check-{stream}'
+    name: "{project-name}-distribution-check-{stream}"

 
     ######################
     # Default parameters #
     ######################
 
     mvn-version: mvn35
 
     ######################
     # Default parameters #
     ######################
 
     mvn-version: mvn35

-    csit-gate-list: ''
+    csit-gate-list: ""

     block_on_csit: false
     # Unless block_on_csit is true, the failure-threshold will be ignored. For project jobs that
     # want to fail distribution check on csit jobs, they will only need a list of jobs to run
     # plus the change of block_on_csit to true, and this failure-threshold: 'UNSTABLE' will take
     # effect
     block_on_csit: false
     # Unless block_on_csit is true, the failure-threshold will be ignored. For project jobs that
     # want to fail distribution check on csit jobs, they will only need a list of jobs to run
     # plus the change of block_on_csit to true, and this failure-threshold: 'UNSTABLE' will take
     # effect

-    failure-threshold: 'UNSTABLE'
+    failure-threshold: "UNSTABLE"

     disable-job: false
 
     #####################
     disable-job: false
 
     #####################


@@ -23,39 +23,39 @@
     # Operation: This job template builds a patch, creates a distribution containing
     #            the patch (making sure dependencies are specified),
     #            and performs the distribution deploy test.
     # Operation: This job template builds a patch, creates a distribution containing
     #            the patch (making sure dependencies are specified),
     #            and performs the distribution deploy test.

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     project-type: freestyle
 
     project-type: freestyle

-    node: 'centos7-builder-8c-8g'
+    node: "centos7-builder-8c-8g"

     concurrent: true
 
     properties:
       - opendaylight-infra-properties:
     concurrent: true
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-distribution-git-url:
       - integration-distribution-git-url:

-          git-url: '{git-url}'
+          git-url: "{git-url}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - maven-exec:
       - maven-exec:

-          maven-version: '{mvn-version}'
+          maven-version: "{mvn-version}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: '$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          basedir: "$GERRIT_PROJECT"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

       - integration-distribution-scm:
       - integration-distribution-scm:

-          branch: '{distribution_branch}'
+          branch: "{distribution_branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:


@@ -64,45 +64,45 @@
           # enforce a 60 minute limit to ensure stuck jobs get
           # cleared up sooner.
           # Double that as Karaf 3+4 may take longer.
           # enforce a 60 minute limit to ensure stuck jobs get
           # cleared up sooner.
           # Double that as Karaf 3+4 may take longer.

-          build-timeout: '120'
+          build-timeout: "120"

 
     triggers:
       - gerrit-trigger-patch-submitted:
 
     triggers:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
+          forbidden-files: ""

 
     builders:
       - distribution-check-wipe
       - lf-update-java-alternatives:
 
     builders:
       - distribution-check-wipe
       - lf-update-java-alternatives:

-          java-version: '{java-version}'
+          java-version: "{java-version}"

       - inject:
       - inject:

-          properties-file: 'allowed_projects.txt'
+          properties-file: "allowed_projects.txt"

       - distribution-check-build-project:
       - distribution-check-build-project:

-          pom: '$GERRIT_PROJECT/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-          mvn-version: '{mvn-version}'
+          pom: "$GERRIT_PROJECT/pom.xml"
+          mvn-opts: "{opendaylight-infra-mvn-opts}"
+          mvn-version: "{mvn-version}"

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:

-          gerrit-project: '$GERRIT_PROJECT'
+          gerrit-project: "$GERRIT_PROJECT"

       - distribution-check-download-deps:
       - distribution-check-download-deps:

-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-          mvn-version: '{mvn-version}'
+          dist-pom: "distribution/pom.xml"
+          mvn-opts: "{opendaylight-infra-mvn-opts}"
+          mvn-version: "{mvn-version}"

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
       - distribution-check-repeat-project-build:
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
       - distribution-check-repeat-project-build:

-          pom: '$GERRIT_PROJECT/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-          mvn-version: '{mvn-version}'
+          pom: "$GERRIT_PROJECT/pom.xml"
+          mvn-opts: "{opendaylight-infra-mvn-opts}"
+          mvn-version: "{mvn-version}"

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-repeat-distro-build:
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-repeat-distro-build:

-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-          mvn-version: '{mvn-version}'
+          dist-pom: "distribution/pom.xml"
+          mvn-opts: "{opendaylight-infra-mvn-opts}"
+          mvn-version: "{mvn-version}"

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191


@@ -112,79 +112,79 @@
       - distribution-check-bootup
 
       - trigger-builds:
       - distribution-check-bootup
 
       - trigger-builds:

-          - project: '{csit-gate-list}'
-            block: '{obj:block_on_csit}'
+          - project: "{csit-gate-list}"
+            block: "{obj:block_on_csit}"

             block-thresholds:
             block-thresholds:

-              failure-threshold: '{failure-threshold}'
+              failure-threshold: "{failure-threshold}"

             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"

       - integration-csit-archive-build
       - lf-infra-publish
 
 - job-template:
       - integration-csit-archive-build
       - lf-infra-publish
 
 - job-template:

-    name: 'distribution-verify-{type}-{stream}'
+    name: "distribution-verify-{type}-{stream}"

 
 

-    disable-job: 'false'
+    disable-job: "false"

 
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
 
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - gerrit-trigger-scm:
 
     scm:
       - gerrit-trigger-scm:

-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
       - gerrit-trigger-patch-submitted:
 
     triggers:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{files}'
-          forbidden-files: '{forbidden-files}'
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{files}"
+          forbidden-files: "{forbidden-files}"

 
     builders:
       - wipe-org-opendaylight-repo
       - lf-provide-maven-settings:
 
     builders:
       - wipe-org-opendaylight-repo
       - lf-provide-maven-settings:

-          global-settings-file: 'global-settings'
-          settings-file: 'integration-settings'
+          global-settings-file: "global-settings"
+          settings-file: "integration-settings"

       - lf-update-java-alternatives:
       - lf-update-java-alternatives:

-          java-version: '{java-version}'
+          java-version: "{java-version}"

       - maven-target:
           maven-version: mvn35
           pom: pom.xml
           goals: |
       - maven-target:
           maven-version: mvn35
           pom: pom.xml
           goals: |

-              clean install dependency:tree -DoutputFile=dependency_tree.txt
-              -Dstream={stream}
-              -Dsft.heap.max=4g
-              {opendaylight-infra-mvn-opts}
-              {profile}
+            clean install dependency:tree -DoutputFile=dependency_tree.txt
+            -Dstream={stream}
+            -Dsft.heap.max=4g
+            {opendaylight-infra-mvn-opts}
+            {profile}

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:

-            - '-Xmx1024m'
+            - "-Xmx1024m"

           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings


@@ -195,11 +195,11 @@
       - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
       - lf-jacoco-report
       - lf-infra-publish
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"

 
 - job-template:
 
 - job-template:

-    name: 'distribution-merge-{type}-{stream}'
+    name: "distribution-merge-{type}-{stream}"

 
     # Need to keep jobs that deploy to Nexus at end of build as Maven
     # projects. Maybe reconsider this once upstream moves deploy to a
 
     # Need to keep jobs that deploy to Nexus at end of build as Maven
     # projects. Maybe reconsider this once upstream moves deploy to a


@@ -209,64 +209,64 @@
     disable-job: false
 
     project-type: maven
     disable-job: false
 
     project-type: maven

-    node: 'centos7-builder-8c-8g'
-    disabled: '{disable-job}'
+    node: "centos7-builder-8c-8g"
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     scm:
       - gerrit-trigger-scm:
 
     scm:
       - gerrit-trigger-scm:

-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: ""
+          choosing-strategy: "default"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
       - gerrit-trigger-patch-merged:
 
     triggers:
       - gerrit-trigger-patch-merged:

-          gerrit-server-name: '{gerrit-server-name}'
-          name: '{project}'
-          branch: '{branch}'
-          files: '{files}'
-          forbidden-files: '{forbidden-files}'
+          gerrit-server-name: "{gerrit-server-name}"
+          name: "{project}"
+          branch: "{branch}"
+          files: "{files}"
+          forbidden-files: "{forbidden-files}"

       - reverse:
       - reverse:

-          jobs: '{dependencies}'
+          jobs: "{dependencies}"

 
     prebuilders:
       - wipe-org-opendaylight-repo
       - lf-jacoco-nojava-workaround
       - lf-provide-maven-settings:
 
     prebuilders:
       - wipe-org-opendaylight-repo
       - lf-jacoco-nojava-workaround
       - lf-provide-maven-settings:

-          global-settings-file: 'global-settings'
-          settings-file: 'integration-settings'
+          global-settings-file: "global-settings"
+          settings-file: "integration-settings"

       - lf-update-java-alternatives:
       - lf-update-java-alternatives:

-          java-version: '{java-version}'
+          java-version: "{java-version}"

       - integration-set-variables
       - distribute-build-url:
       - integration-set-variables
       - distribute-build-url:

-          path: '$KARAF_ARTIFACT/src/main/assembly'
+          path: "$KARAF_ARTIFACT/src/main/assembly"

 
     maven:
 
     maven:

-      maven-name: 'mvn35'
-      root-pom: 'pom.xml'
+      maven-name: "mvn35"
+      root-pom: "pom.xml"

       goals: >
       goals: >

-          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
-          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          -Dsft.heap.max=4g
-          -Djenkins -Dmerge -Dstream={stream}
-          {profile}
-      maven-opts: '-Xmx1024m'
+        clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
+        -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+        -Dsft.heap.max=4g
+        -Djenkins -Dmerge -Dstream={stream}
+        {profile}
+      maven-opts: "-Xmx1024m"

       settings: integration-settings
       settings-type: cfp
       global-settings: global-settings
       settings: integration-settings
       settings-type: cfp
       global-settings: global-settings


@@ -283,17 +283,17 @@
 
     publishers:
       - maven-deploy:
 
     publishers:
       - maven-deploy:

-          id: ''
+          id: ""

           unique-version: true
           deploy-unstable: false
       - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           unique-version: true
           deploy-unstable: false
       - lf-jacoco-report
       - lf-infra-publish
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"

 
 - job-template:
 
 - job-template:

-    name: 'distribution-check-{type}-{stream}'
+    name: "distribution-check-{type}-{stream}"

 
     ######################
     # Default parameters #
 
     ######################
     # Default parameters #


@@ -306,35 +306,35 @@
     #####################
 
     # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
     #####################
 
     # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     project-type: freestyle
 
     project-type: freestyle

-    node: 'centos7-builder-8c-8g'
+    node: "centos7-builder-8c-8g"

     concurrent: true
 
     properties:
       - opendaylight-infra-properties:
     concurrent: true
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - maven-exec:
           maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
       - maven-exec:
           maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'distribution'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          basedir: "distribution"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:


@@ -343,56 +343,56 @@
           # enforce a 60 minute limit to ensure stuck jobs get
           # cleared up sooner.
           # Double that as Karaf 3+4 may take longer.
           # enforce a 60 minute limit to ensure stuck jobs get
           # cleared up sooner.
           # Double that as Karaf 3+4 may take longer.

-          build-timeout: '120'
+          build-timeout: "120"

 
     triggers:
       - gerrit-trigger-patch-submitted:
 
     triggers:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{files}'
-          forbidden-files: '{forbidden-files}'
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{files}"
+          forbidden-files: "{forbidden-files}"

 
     builders:
       - distribution-check-wipe
       - lf-update-java-alternatives:
 
     builders:
       - distribution-check-wipe
       - lf-update-java-alternatives:

-          java-version: '{java-version}'
+          java-version: "{java-version}"

       - inject:
       - inject:

-          properties-file: 'allowed_projects.txt'
+          properties-file: "allowed_projects.txt"

       - distribution-check-build-project:
       - distribution-check-build-project:

-          pom: 'distribution/pom.xml'
+          pom: "distribution/pom.xml"

           mvn-opts: |
           mvn-opts: |

-              {opendaylight-infra-mvn-opts}
-              {profile}
-          mvn-version: '{mvn-version}'
+            {opendaylight-infra-mvn-opts}
+            {profile}
+          mvn-version: "{mvn-version}"

           # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:
           # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:

-          gerrit-project: 'integration'
+          gerrit-project: "integration"

       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
       - distribution-check-repeat-project-build:
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
       - distribution-check-repeat-project-build:

-          pom: 'distribution/pom.xml'
+          pom: "distribution/pom.xml"

           mvn-opts: |
           mvn-opts: |

-              {opendaylight-infra-mvn-opts}
-              {profile}
-          mvn-version: '{mvn-version}'
+            {opendaylight-infra-mvn-opts}
+            {profile}
+          mvn-version: "{mvn-version}"

           # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191
       - distribution-check-warn-9192
       - integration-upload-distribution:
           # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191
       - distribution-check-warn-9192
       - integration-upload-distribution:

-          dist-pom: '{dist-pom}'
+          dist-pom: "{dist-pom}"

       - distribution-check-bootup
 
     publishers:
       - email-notification:
       - distribution-check-bootup
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"

       - integration-csit-archive-build
       - lf-infra-publish
 
 - job-template:
       - integration-csit-archive-build
       - lf-infra-publish
 
 - job-template:

-    name: 'distribution-sanity-{stream}'
+    name: "distribution-sanity-{stream}"

     # Goal: Verify distribution starts with no issues when all features are loaded.
     # Operation: This job deploys odl-integration-all + list of UM features.
     # This job works for both managed & self-managed distro.
     # Goal: Verify distribution starts with no issues when all features are loaded.
     # Operation: This job deploys odl-integration-all + list of UM features.
     # This job works for both managed & self-managed distro.


@@ -403,39 +403,39 @@
 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-bundle-url:
       - integration-bundle-url:

-          bundle-url: '{bundle-url}'
+          bundle-url: "{bundle-url}"

       - integration-repo-url:
       - integration-repo-url:

-          repo-url: '{sm-repos}'
+          repo-url: "{sm-repos}"

       - integration-controller-parameters:
       - integration-controller-parameters:

-          controller-features: '{sm-features}'
+          controller-features: "{sm-features}"

           # Parameters below are unused in this job so set them all to blank
           # Parameters below are unused in this job so set them all to blank

-          controller-max-mem: ''
-          controller-debug-map: ''
-          controller-scope: ''
-          controller-use-features-boot: ''
-          feature-elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-max-mem: ""
+          controller-debug-map: ""
+          controller-scope: ""
+          controller-use-features-boot: ""
+          feature-elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - integration-detect-variables
 
     builders:
       - integration-detect-variables


@@ -443,13 +443,13 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"

       - integration-csit-archive-build
       - lf-infra-publish
 
 - job-template:
       - integration-csit-archive-build
       - lf-infra-publish
 
 - job-template:

-    name: 'distribution-csit-managed-{stream}'
+    name: "distribution-csit-managed-{stream}"

     # Goal: Verify distribution starts with no issues when all features are loaded.
     # Operation: This job deploys odl-integration-all.
     # This job works for just managed distro.
     # Goal: Verify distribution starts with no issues when all features are loaded.
     # Operation: This job deploys odl-integration-all.
     # This job works for just managed distro.


@@ -459,33 +459,33 @@
     project-type: freestyle
     node: centos7-builder-4c-4g
     concurrent: false
     project-type: freestyle
     node: centos7-builder-4c-4g
     concurrent: false

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-bundle-url:
       - integration-bundle-url:

-          bundle-url: '{bundle-url}'
+          bundle-url: "{bundle-url}"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: 'karaf4'
+          karaf-version: "karaf4"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - integration-detect-variables
 
     builders:
       - integration-detect-variables


@@ -493,7 +493,7 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"

       - integration-csit-archive-build
       - lf-infra-publish
       - integration-csit-archive-build
       - lf-infra-publish

diff --git a/jjb/integration/integration-macros-heat.yaml b/jjb/integration/integration-macros-heat.yaml
index 87cb7f37202dc061ca2d5b5e72f2f361cb56fdf3..010cf89b61ff6963d2175a434860d87c9f2ec3db 100644 (file)
--- a/jjb/integration/integration-macros-heat.yaml
+++ b/jjb/integration/integration-macros-heat.yaml
@@ -12,43 +12,43 @@
     parameters:
       - string:
           name: VM_0_COUNT
     parameters:
       - string:
           name: VM_0_COUNT

-          default: '{vm_0_count}'
-          description: 'Number of systems to spawn for vm 0'
+          default: "{vm_0_count}"
+          description: "Number of systems to spawn for vm 0"

       - string:
           name: VM_0_FLAVOR
       - string:
           name: VM_0_FLAVOR

-          default: '{vm_0_flavor}'
-          description: 'VM flavor to use for vm 0'
+          default: "{vm_0_flavor}"
+          description: "VM flavor to use for vm 0"

       - string:
           name: VM_0_IMAGE
       - string:
           name: VM_0_IMAGE

-          default: '{vm_0_image}'
-          description: 'VM image to use for vm 0'
+          default: "{vm_0_image}"
+          description: "VM image to use for vm 0"

       - string:
           name: VM_1_COUNT
       - string:
           name: VM_1_COUNT

-          default: '{vm_1_count}'
-          description: 'Number of systems to spawn for vm 1'
+          default: "{vm_1_count}"
+          description: "Number of systems to spawn for vm 1"

       - string:
           name: VM_1_FLAVOR
       - string:
           name: VM_1_FLAVOR

-          default: '{vm_1_flavor}'
-          description: 'VM flavor to use for vm 1'
+          default: "{vm_1_flavor}"
+          description: "VM flavor to use for vm 1"

       - string:
           name: VM_1_IMAGE
       - string:
           name: VM_1_IMAGE

-          default: '{vm_1_image}'
-          description: 'VM image to use for vm 1'
+          default: "{vm_1_image}"
+          description: "VM image to use for vm 1"

 
 - builder:
     name: integration-stack-2-type
     builders:
       - lf-stack-create:
 
 - builder:
     name: integration-stack-2-type
     builders:
       - lf-stack-create:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

           openstack-heat-parameters: |
           openstack-heat-parameters: |

-              vm_0_count: '$VM_0_COUNT'
-              vm_0_flavor: '$VM_0_FLAVOR'
-              vm_0_image: '$VM_0_IMAGE'
-              vm_1_count: '$VM_1_COUNT'
-              vm_1_flavor: '$VM_1_FLAVOR'
-              vm_1_image: '$VM_1_IMAGE'
+            vm_0_count: '$VM_0_COUNT'
+            vm_0_flavor: '$VM_0_FLAVOR'
+            vm_0_image: '$VM_0_IMAGE'
+            vm_1_count: '$VM_1_COUNT'
+            vm_1_flavor: '$VM_1_FLAVOR'
+            vm_1_image: '$VM_1_IMAGE'

 
 ################
 # Stack 3 Type #
 
 ################
 # Stack 3 Type #


@@ -63,58 +63,58 @@
     parameters:
       - string:
           name: VM_0_COUNT
     parameters:
       - string:
           name: VM_0_COUNT

-          default: '{vm_0_count}'
-          description: 'Number of systems to spawn for vm 0'
+          default: "{vm_0_count}"
+          description: "Number of systems to spawn for vm 0"

       - string:
           name: VM_0_FLAVOR
       - string:
           name: VM_0_FLAVOR

-          default: '{vm_0_flavor}'
-          description: 'VM flavor to use for vm 0'
+          default: "{vm_0_flavor}"
+          description: "VM flavor to use for vm 0"

       - string:
           name: VM_0_IMAGE
       - string:
           name: VM_0_IMAGE

-          default: '{vm_0_image}'
-          description: 'VM image to use for vm 0'
+          default: "{vm_0_image}"
+          description: "VM image to use for vm 0"

       - string:
           name: VM_1_COUNT
       - string:
           name: VM_1_COUNT

-          default: '{vm_1_count}'
-          description: 'Number of systems to spawn for vm 1'
+          default: "{vm_1_count}"
+          description: "Number of systems to spawn for vm 1"

       - string:
           name: VM_1_FLAVOR
       - string:
           name: VM_1_FLAVOR

-          default: '{vm_1_flavor}'
-          description: 'VM flavor to use for vm 1'
+          default: "{vm_1_flavor}"
+          description: "VM flavor to use for vm 1"

       - string:
           name: VM_1_IMAGE
       - string:
           name: VM_1_IMAGE

-          default: '{vm_1_image}'
-          description: 'VM image to use for vm 1'
+          default: "{vm_1_image}"
+          description: "VM image to use for vm 1"

       - string:
           name: VM_2_COUNT
       - string:
           name: VM_2_COUNT

-          default: '{vm_2_count}'
-          description: 'Number of systems to spawn for vm 2'
+          default: "{vm_2_count}"
+          description: "Number of systems to spawn for vm 2"

       - string:
           name: VM_2_FLAVOR
       - string:
           name: VM_2_FLAVOR

-          default: '{vm_2_flavor}'
-          description: 'VM flavor to use for vm 2'
+          default: "{vm_2_flavor}"
+          description: "VM flavor to use for vm 2"

       - string:
           name: VM_2_IMAGE
       - string:
           name: VM_2_IMAGE

-          default: '{vm_2_image}'
-          description: 'VM image to use for vm 2'
+          default: "{vm_2_image}"
+          description: "VM image to use for vm 2"

 
 - builder:
     name: integration-stack-3-type
     builders:
       - lf-stack-create:
 
 - builder:
     name: integration-stack-3-type
     builders:
       - lf-stack-create:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

           openstack-heat-parameters: |
           openstack-heat-parameters: |

-              vm_0_count: '$VM_0_COUNT'
-              vm_0_flavor: '$VM_0_FLAVOR'
-              vm_0_image: '$VM_0_IMAGE'
-              vm_1_count: '$VM_1_COUNT'
-              vm_1_flavor: '$VM_1_FLAVOR'
-              vm_1_image: '$VM_1_IMAGE'
-              vm_2_count: '$VM_2_COUNT'
-              vm_2_flavor: '$VM_2_FLAVOR'
-              vm_2_image: '$VM_2_IMAGE'
+            vm_0_count: '$VM_0_COUNT'
+            vm_0_flavor: '$VM_0_FLAVOR'
+            vm_0_image: '$VM_0_IMAGE'
+            vm_1_count: '$VM_1_COUNT'
+            vm_1_flavor: '$VM_1_FLAVOR'
+            vm_1_image: '$VM_1_IMAGE'
+            vm_2_count: '$VM_2_COUNT'
+            vm_2_flavor: '$VM_2_FLAVOR'
+            vm_2_image: '$VM_2_IMAGE'

 
 ################
 # Stack 4 Type #
 
 ################
 # Stack 4 Type #


@@ -129,71 +129,70 @@
     parameters:
       - string:
           name: VM_0_COUNT
     parameters:
       - string:
           name: VM_0_COUNT

-          default: '{vm_0_count}'
-          description: 'Number of systems to spawn for vm 0'
+          default: "{vm_0_count}"
+          description: "Number of systems to spawn for vm 0"

       - string:
           name: VM_0_FLAVOR
       - string:
           name: VM_0_FLAVOR

-          default: '{vm_0_flavor}'
-          description: 'VM flavor to use for vm 0'
+          default: "{vm_0_flavor}"
+          description: "VM flavor to use for vm 0"

       - string:
           name: VM_0_IMAGE
       - string:
           name: VM_0_IMAGE

-          default: '{vm_0_image}'
-          description: 'VM image to use for vm 0'
+          default: "{vm_0_image}"
+          description: "VM image to use for vm 0"

       - string:
           name: VM_1_COUNT
       - string:
           name: VM_1_COUNT

-          default: '{vm_1_count}'
-          description: 'Number of systems to spawn for vm 1'
+          default: "{vm_1_count}"
+          description: "Number of systems to spawn for vm 1"

       - string:
           name: VM_1_FLAVOR
       - string:
           name: VM_1_FLAVOR

-          default: '{vm_1_flavor}'
-          description: 'VM flavor to use for vm 1'
+          default: "{vm_1_flavor}"
+          description: "VM flavor to use for vm 1"

       - string:
           name: VM_1_IMAGE
       - string:
           name: VM_1_IMAGE

-          default: '{vm_1_image}'
-          description: 'VM image to use for vm 1'
+          default: "{vm_1_image}"
+          description: "VM image to use for vm 1"

       - string:
           name: VM_2_COUNT
       - string:
           name: VM_2_COUNT

-          default: '{vm_2_count}'
-          description: 'Number of systems to spawn for vm 2'
+          default: "{vm_2_count}"
+          description: "Number of systems to spawn for vm 2"

       - string:
           name: VM_2_FLAVOR
       - string:
           name: VM_2_FLAVOR

-          default: '{vm_2_flavor}'
-          description: 'VM flavor to use for vm 2'
+          default: "{vm_2_flavor}"
+          description: "VM flavor to use for vm 2"

       - string:
           name: VM_2_IMAGE
       - string:
           name: VM_2_IMAGE

-          default: '{vm_2_image}'
-          description: 'VM image to use for vm 2'
+          default: "{vm_2_image}"
+          description: "VM image to use for vm 2"

       - string:
           name: VM_3_COUNT
       - string:
           name: VM_3_COUNT

-          default: '{vm_3_count}'
-          description: 'Number of systems to spawn for vm 3'
+          default: "{vm_3_count}"
+          description: "Number of systems to spawn for vm 3"

       - string:
           name: VM_3_FLAVOR
       - string:
           name: VM_3_FLAVOR

-          default: '{vm_3_flavor}'
-          description: 'VM flavor to use for vm 3'
+          default: "{vm_3_flavor}"
+          description: "VM flavor to use for vm 3"

       - string:
           name: VM_3_IMAGE
       - string:
           name: VM_3_IMAGE

-          default: '{vm_3_image}'
-          description: 'VM image to use for vm 3'
-
+          default: "{vm_3_image}"
+          description: "VM image to use for vm 3"

 
 - builder:
     name: integration-stack-4-type
     builders:
       - lf-stack-create:
 
 - builder:
     name: integration-stack-4-type
     builders:
       - lf-stack-create:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

           openstack-heat-parameters: |
           openstack-heat-parameters: |

-              vm_0_count: '$VM_0_COUNT'
-              vm_0_flavor: '$VM_0_FLAVOR'
-              vm_0_image: '$VM_0_IMAGE'
-              vm_1_count: '$VM_1_COUNT'
-              vm_1_flavor: '$VM_1_FLAVOR'
-              vm_1_image: '$VM_1_IMAGE'
-              vm_2_count: '$VM_2_COUNT'
-              vm_2_flavor: '$VM_2_FLAVOR'
-              vm_2_image: '$VM_2_IMAGE'
-              vm_3_count: '$VM_3_COUNT'
-              vm_3_flavor: '$VM_3_FLAVOR'
-              vm_3_image: '$VM_3_IMAGE'
+            vm_0_count: '$VM_0_COUNT'
+            vm_0_flavor: '$VM_0_FLAVOR'
+            vm_0_image: '$VM_0_IMAGE'
+            vm_1_count: '$VM_1_COUNT'
+            vm_1_flavor: '$VM_1_FLAVOR'
+            vm_1_image: '$VM_1_IMAGE'
+            vm_2_count: '$VM_2_COUNT'
+            vm_2_flavor: '$VM_2_FLAVOR'
+            vm_2_image: '$VM_2_IMAGE'
+            vm_3_count: '$VM_3_COUNT'
+            vm_3_flavor: '$VM_3_FLAVOR'
+            vm_3_image: '$VM_3_IMAGE'

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index a5fd3c6fec02bf2fe0f5833554881abbf247ab11..888e01a871fa0c637432cf3fb65c1578a38d835c 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -6,80 +6,79 @@
     name: integration-csit-parameters
     parameters:
       - opendaylight-infra-parameters:
     name: integration-csit-parameters
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "integration/test"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       # CSIT
       - integration-bundle-url:
       # CSIT
       - integration-bundle-url:

-          bundle-url: '{bundle-url}'
+          bundle-url: "{bundle-url}"

       - integration-repo-url:
       - integration-repo-url:

-          repo-url: '{repo-url}'
+          repo-url: "{repo-url}"

       - integration-test-options:
       - integration-test-options:

-          test-options: '{robot-options}'
+          test-options: "{robot-options}"

       - integration-controller-parameters:
       - integration-controller-parameters:

-          controller-debug-map: '{debug-map}'
-          controller-features: '{install-features}'
-          controller-max-mem: '{controller-max-mem}'
-          controller-scope: '{controller-scope}'
-          controller-use-features-boot: '{use-features-boot}'
-          feature-elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-debug-map: "{debug-map}"
+          controller-features: "{install-features}"
+          controller-max-mem: "{controller-max-mem}"
+          controller-scope: "{controller-scope}"
+          controller-use-features-boot: "{use-features-boot}"
+          feature-elasticsearch-attribute: "{elasticsearch-attribute}"

 
 - parameter:
     name: integration-controller-parameters
     parameters:
       - string:
           name: CONTROLLERSCOPE
 
 - parameter:
     name: integration-controller-parameters
     parameters:
       - string:
           name: CONTROLLERSCOPE

-          default: '{controller-scope}'
-          description: 'Feature Only or Feature All test'
+          default: "{controller-scope}"
+          description: "Feature Only or Feature All test"

 
       - string:
           name: CONTROLLERFEATURES
 
       - string:
           name: CONTROLLERFEATURES

-          default: '{controller-features}'
+          default: "{controller-features}"

           description: |
           description: |

-              Features to install in the controller separated by comma.
-              (note: Do not include decanter* features used for harvesting JVM metrics.
-               They are inserted in install scripts.)
+            Features to install in the controller separated by comma.
+            (note: Do not include decanter* features used for harvesting JVM metrics.
+             They are inserted in install scripts.)

 
       - string:
           name: CONTROLLERDEBUGMAP
 
       - string:
           name: CONTROLLERDEBUGMAP

-          default: '{controller-debug-map}'
+          default: "{controller-debug-map}"

           description: |
           description: |

-              Key:Value map of debugs to enable on the controller separated by spaces.
-              The module should not include org.opendaylight.
-              The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
-              (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
+            Key:Value map of debugs to enable on the controller separated by spaces.
+            The module should not include org.opendaylight.
+            The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
+            (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)

 
       - string:
           name: CONTROLLERMAXMEM
 
       - string:
           name: CONTROLLERMAXMEM

-          default: '{controller-max-mem}'
+          default: "{controller-max-mem}"

           description: |
           description: |

-              Max Heap size to use when starting the controller.
+            Max Heap size to use when starting the controller.

 
       - string:
           name: ELASTICSEARCHATTRIBUTE
 
       - string:
           name: ELASTICSEARCHATTRIBUTE

-          default: '{feature-elasticsearch-attribute}'
+          default: "{feature-elasticsearch-attribute}"

           description: |
           description: |

-              Configure the period the script should harvest JVM metrics.
-              Possible values: long (=120000)
-                               short (=5000)
-                               any number between 5000 and 120000
-                               disabled (use for disabling harvesting)
+            Configure the period the script should harvest JVM metrics.
+            Possible values: long (=120000)
+                             short (=5000)
+                             any number between 5000 and 120000
+                             disabled (use for disabling harvesting)

 
       - string:
           name: USEFEATURESBOOT
 
       - string:
           name: USEFEATURESBOOT

-          default: '{controller-use-features-boot}'
-          description: 'Boolean to toggle whether featuresBoot is appended or ignored'
-
+          default: "{controller-use-features-boot}"
+          description: "Boolean to toggle whether featuresBoot is appended or ignored"

 
 - parameter:
     name: integration-distribution-branch
     parameters:
       - string:
           name: DISTROBRANCH
 
 - parameter:
     name: integration-distribution-branch
     parameters:
       - string:
           name: DISTROBRANCH

-          default: '{branch}'
-          description: 'Distribution GIT branch'
+          default: "{branch}"
+          description: "Distribution GIT branch"

 
 - parameter:
     name: distribution-karaf-version
 
 - parameter:
     name: distribution-karaf-version


@@ -88,108 +87,108 @@
     parameters:
       - string:
           name: KARAF_VERSION
     parameters:
       - string:
           name: KARAF_VERSION

-          default: '{karaf-version}'
-          description: 'karaf3, karaf4, odl, affects ODL deploy scripts'
+          default: "{karaf-version}"
+          description: "karaf3, karaf4, odl, affects ODL deploy scripts"

 
 - parameter:
     name: integration-bundle-url
     parameters:
       - string:
           name: BUNDLE_URL
 
 - parameter:
     name: integration-bundle-url
     parameters:
       - string:
           name: BUNDLE_URL

-          default: '{bundle-url}'
-          description: 'URL to karaf distribution zip'
+          default: "{bundle-url}"
+          description: "URL to karaf distribution zip"

 
 - parameter:
     name: integration-repo-url
     parameters:
       - string:
           name: REPO_URL
 
 - parameter:
     name: integration-repo-url
     parameters:
       - string:
           name: REPO_URL

-          default: '{repo-url}'
-          description: 'URL to feature repo artifact'
+          default: "{repo-url}"
+          description: "URL to feature repo artifact"

 
 - parameter:
     name: integration-jdk-version
     parameters:
       - string:
           name: JDKVERSION
 
 - parameter:
     name: integration-jdk-version
     parameters:
       - string:
           name: JDKVERSION

-          default: '{jdkversion}'
-          description: 'Parameter to indicate JAVA Version'
+          default: "{jdkversion}"
+          description: "Parameter to indicate JAVA Version"

 
 - parameter:
     name: integration-distribution-stream
     parameters:
       - string:
           name: DISTROSTREAM
 
 - parameter:
     name: integration-distribution-stream
     parameters:
       - string:
           name: DISTROSTREAM

-          default: '{stream}'
-          description: 'Distribution stream string, for suites to know which behavior to expect'
+          default: "{stream}"
+          description: "Distribution stream string, for suites to know which behavior to expect"

 
 - parameter:
     name: integration-script-plan
     parameters:
       - string:
           name: SCRIPTPLAN
 
 - parameter:
     name: integration-script-plan
     parameters:
       - string:
           name: SCRIPTPLAN

-          default: '{script-plan}'
-          description: 'Script plan we will run before downloading and un-archiving am ODL distribution'
+          default: "{script-plan}"
+          description: "Script plan we will run before downloading and un-archiving am ODL distribution"

 
 - parameter:
     name: integration-config-plan
     parameters:
       - string:
           name: CONFIGPLAN
 
 - parameter:
     name: integration-config-plan
     parameters:
       - string:
           name: CONFIGPLAN

-          default: '{config-plan}'
-          description: 'Config plan we will run after un-archiving and starting an ODL distribution'
+          default: "{config-plan}"
+          description: "Config plan we will run after un-archiving and starting an ODL distribution"

 
 - parameter:
     name: integration-stream-test-plan
     parameters:
       - string:
           name: STREAMTESTPLAN
 
 - parameter:
     name: integration-stream-test-plan
     parameters:
       - string:
           name: STREAMTESTPLAN

-          default: '{stream-test-plan}'
-          description: 'Stream-specific test plan we will run'
+          default: "{stream-test-plan}"
+          description: "Stream-specific test plan we will run"

 
 - parameter:
     name: integration-test-plan
     parameters:
       - string:
           name: TESTPLAN
 
 - parameter:
     name: integration-test-plan
     parameters:
       - string:
           name: TESTPLAN

-          default: '{test-plan}'
-          description: 'General test plan we will run unless stream-specific one is found'
+          default: "{test-plan}"
+          description: "General test plan we will run unless stream-specific one is found"

 
 - parameter:
     name: integration-test-suites
     parameters:
       - string:
           name: SUITES
 
 - parameter:
     name: integration-test-suites
     parameters:
       - string:
           name: SUITES

-          default: '{test-suites}'
+          default: "{test-suites}"

           description: |
           description: |

-              List of space-separated suites. Useful when running specific suites within a testplan.
-              Do not include ${{WORKSPACE}}/test/csit/suites/ in the values:
-              (ex. openstack/connectivity/l2.robot openstack/clustering/ha_l2.robot
-               openstack/tempest/tempest.robot netvirt/elan/elan.robot).
+            List of space-separated suites. Useful when running specific suites within a testplan.
+            Do not include ${{WORKSPACE}}/test/csit/suites/ in the values:
+            (ex. openstack/connectivity/l2.robot openstack/clustering/ha_l2.robot
+             openstack/tempest/tempest.robot netvirt/elan/elan.robot).

 
 - parameter:
     name: integration-test-options
     parameters:
       - string:
           name: TESTOPTIONS
 
 - parameter:
     name: integration-test-options
     parameters:
       - string:
           name: TESTOPTIONS

-          default: '{test-options}'
-          description: 'Robot command options'
+          default: "{test-options}"
+          description: "Robot command options"

 
 - parameter:
     name: integration-distribution-git-url
     parameters:
       - string:
           name: DISTROGITURL
 
 - parameter:
     name: integration-distribution-git-url
     parameters:
       - string:
           name: DISTROGITURL

-          default: '{git-url}/integration/distribution'
-          description: 'Distribution GIT URL (do not modify)'
+          default: "{git-url}/integration/distribution"
+          description: "Distribution GIT URL (do not modify)"

 
 - parameter:
     name: integration-patch-refspec
     parameters:
       - string:
           name: PATCHREFSPEC
 
 - parameter:
     name: integration-patch-refspec
     parameters:
       - string:
           name: PATCHREFSPEC

-          default: '{branch}'
-          description: 'Integration Patch Refspec'
+          default: "{branch}"
+          description: "Integration Patch Refspec"

 
 # Macro: integration-gerrit-scm
 # Operation: this macro downloads a project gerrit
 
 # Macro: integration-gerrit-scm
 # Operation: this macro downloads a project gerrit


@@ -199,14 +198,14 @@
     name: integration-gerrit-scm
     scm:
       - git:
     name: integration-gerrit-scm
     scm:
       - git:

-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          basedir: '{basedir}'
-          refspec: '{refspec}'
+          credentials-id: "opendaylight-jenkins-ssh"
+          url: "$GIT_BASE"
+          basedir: "{basedir}"
+          refspec: "{refspec}"

           branches:
           branches:

-            - 'origin/{branch}'
+            - "origin/{branch}"

           skip-tag: true
           skip-tag: true

-          choosing-strategy: 'gerrit'
+          choosing-strategy: "gerrit"

 
 # Macro: integration-distribution-scm
 # Operation: this macro downloads the integration/distribution repo using distribution as basedir
 
 # Macro: integration-distribution-scm
 # Operation: this macro downloads the integration/distribution repo using distribution as basedir


@@ -216,12 +215,12 @@
     name: integration-distribution-scm
     scm:
       - git:
     name: integration-distribution-scm
     scm:
       - git:

-          credentials-id: 'opendaylight-jenkins-ssh'
-          basedir: 'distribution'
-          url: '$DISTROGITURL'
-          refspec: ''
+          credentials-id: "opendaylight-jenkins-ssh"
+          basedir: "distribution"
+          url: "$DISTROGITURL"
+          refspec: ""

           branches:
           branches:

-            - 'origin/{branch}'
+            - "origin/{branch}"

           skip-tag: true
 
 # Macro: integration-trigger-patch-submitted
           skip-tag: true
 
 # Macro: integration-trigger-patch-submitted


@@ -238,7 +237,7 @@
     name: integration-trigger-patch-submitted
     triggers:
       - gerrit:
     name: integration-trigger-patch-submitted
     triggers:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true


@@ -252,13 +251,13 @@
           gerrit-build-unstable-codereview-value: 0
           projects:
             - project-compare-type: ANT
           gerrit-build-unstable-codereview-value: 0
           projects:
             - project-compare-type: ANT

-              project-pattern: '{project}'
+              project-pattern: "{project}"

               branches:
                 - branch-compare-type: ANT
               branches:
                 - branch-compare-type: ANT

-                  branch-pattern: '**/{branch}'
+                  branch-pattern: "**/{branch}"

               file-paths:
                 - compare-type: ANT
               file-paths:
                 - compare-type: ANT

-                  pattern: '{files}'
+                  pattern: "{files}"

 
 # Macro: integration-csit-only
 # Operation: this macro sets a trigger on reverse job list
 
 # Macro: integration-csit-only
 # Operation: this macro sets a trigger on reverse job list


@@ -268,8 +267,8 @@
     name: integration-csit-trigger
     triggers:
       - reverse:
     name: integration-csit-trigger
     triggers:
       - reverse:

-          jobs: '{jobs}'
-          result: 'success'
+          jobs: "{jobs}"
+          result: "success"

 
 # Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 
 # Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms


@@ -280,12 +279,12 @@
     wrappers:
       - openstack:
           instances:
     wrappers:
       - openstack:
           instances:

-            - cloud-name: 'ODLRPC'
-              template-name: '{controller-image}'
-              count: '{controller-vms}'
-            - cloud-name: 'ODLRPC'
-              template-name: '{mininet-image}'
-              count: '{mininet-vms}'
+            - cloud-name: "ODLRPC"
+              template-name: "{controller-image}"
+              count: "{controller-vms}"
+            - cloud-name: "ODLRPC"
+              template-name: "{mininet-image}"
+              count: "{mininet-vms}"

 
 # Macro: integration-openstack-controller-devstack
 # Operation: this macro will spin the controller and devstack vms
 
 # Macro: integration-openstack-controller-devstack
 # Operation: this macro will spin the controller and devstack vms


@@ -295,12 +294,12 @@
     wrappers:
       - openstack:
           instances:
     wrappers:
       - openstack:
           instances:

-            - cloud-name: 'ODLRPC'
-              template-name: '{controller-image}'
-              count: '{controller-vms}'
-            - cloud-name: 'ODLRPC'
-              template-name: '{openstack-image}'
-              count: '{openstack-vms}'
+            - cloud-name: "ODLRPC"
+              template-name: "{controller-image}"
+              count: "{controller-vms}"
+            - cloud-name: "ODLRPC"
+              template-name: "{openstack-image}"
+              count: "{openstack-vms}"

 
 #################
 # Shell Scripts #
 
 #################
 # Shell Scripts #


@@ -490,10 +489,10 @@
     name: integration-csit-publish
     publishers:
       - robot:
     name: integration-csit-publish
     publishers:
       - robot:

-          output-path: ''
-          other-files: '{obj:robot_other_files}'
-          unstable-threshold: '{robot-unstable-threshold}'
-          pass-threshold: '{robot-pass-threshold}'
+          output-path: ""
+          other-files: "{obj:robot_other_files}"
+          unstable-threshold: "{robot-unstable-threshold}"
+          pass-threshold: "{robot-pass-threshold}"

           only-critical: false
       - integration-csit-archive-build
       - integration-csit-run-postscript
           only-critical: false
       - integration-csit-archive-build
       - integration-csit-run-postscript


@@ -534,7 +533,6 @@
                     # TODO: Tweak the compression level if better ratio (or speed) is needed.
           mark-unstable-if-failed: true
 
                     # TODO: Tweak the compression level if better ratio (or speed) is needed.
           mark-unstable-if-failed: true
 

-

 - publisher:
     name: integration-csit-run-postscript
     publishers:
 - publisher:
     name: integration-csit-run-postscript
     publishers:


@@ -550,8 +548,8 @@
               build-steps:
                 - config-file-provider:
                     files:
               build-steps:
                 - config-file-provider:
                     files:

-                      - file-id: 'odl-elastic-cloud'
-                        target: '${HOME}/.netrc'
+                      - file-id: "odl-elastic-cloud"
+                        target: "${HOME}/.netrc"

                 - shell: |
                     #!/bin/bash
                     #The following script runs any configurable postplan stored in test/csit/postplans.
                 - shell: |
                     #!/bin/bash
                     #The following script runs any configurable postplan stored in test/csit/postplans.


@@ -583,7 +581,7 @@
                 - UNSTABLE
               build-steps:
                 - inject:
                 - UNSTABLE
               build-steps:
                 - inject:

-                    properties-file: 'slave_addresses.txt'
+                    properties-file: "slave_addresses.txt"

                 - shell: |
                     #!/bin/bash
                     source /tmp/common-functions.sh ${BUNDLEFOLDER}
                 - shell: |
                     #!/bin/bash
                     source /tmp/common-functions.sh ${BUNDLEFOLDER}

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index a7b1328e8324b0c05e663bcf7bc6f90390cc2fba..77b2dae6143ba889f9d0806ca4cee6fbb6772c2a 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -26,7 +26,6 @@
 # integration-patch-refspec: test branch ($PATCHREFSPEC)
 # integration-use-features-boot: bool to toggle use of featuresBoot ($USEFEATURESBOOT)
 
 # integration-patch-refspec: test branch ($PATCHREFSPEC)
 # integration-use-features-boot: bool to toggle use of featuresBoot ($USEFEATURESBOOT)
 

-

 ###########
 # Anchors #
 ###########
 ###########
 # Anchors #
 ###########


@@ -40,7 +39,7 @@
     #####################
 
     build-days-to-keep: 30
     #####################
 
     build-days-to-keep: 30

-    build-timeout: 360  # Time in minutes
+    build-timeout: 360 # Time in minutes

     disable-job: false
 
     #####################
     disable-job: false
 
     #####################


@@ -50,22 +49,22 @@
     project-type: freestyle
     node: centos7-robot-2c-8g
     concurrent: true
     project-type: freestyle
     node: centos7-robot-2c-8g
     concurrent: true

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
 #################
 # Job Templates #
 #################
 
 - job-template:
 
 #################
 # Job Templates #
 #################
 
 - job-template:

-    name: '{prefix}{project}-csit-verify-1node-{functionality}'
+    name: "{prefix}{project}-csit-verify-1node-{functionality}"

     id: inttest-csit-verify-1node
     <<: *inttest_csit_common
 
     id: inttest-csit-verify-1node
     <<: *inttest_csit_common
 


@@ -77,12 +76,12 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 

-    odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
-    controller-max-mem: '2048m'
-    tools_system_count: '1'
-    tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    odl_system_flavor: "odl-highcpu-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    controller-max-mem: "2048m"
+    tools_system_count: "1"
+    tools_system_flavor: "odl-highcpu-2"
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     #####################
     # Job configuration #
 
     #####################
     # Job configuration #


@@ -90,69 +89,69 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           controller-scope: only
           # Controller
           controller-scope: only

-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: 'True'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "True"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-2-type:
       - integration-stack-2-type:

-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+          vm_0_count: "1"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{tools_system_count}"
+          vm_1_flavor: "{tools_system_flavor}"
+          vm_1_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{verify-branch}'
+          branch: "{verify-branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{verify-stream}'
+          stream: "{verify-stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-stream-test-plan:
       - integration-stream-test-plan:

-          stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
+          stream-test-plan: "{project}-{functionality}-{verify-stream}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{project}-{functionality}.txt'
+          test-plan: "{project}-{functionality}.txt"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{verify-jdkversion}'
+          jdkversion: "{verify-jdkversion}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{verify-karaf-version}'
+          karaf-version: "{verify-karaf-version}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     triggers:
       - integration-trigger-patch-submitted:
 
     triggers:
       - integration-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: 'integration/test'
-          branch: 'master'
-          files: 'csit/suites/{project}/**'
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "integration/test"
+          branch: "master"
+          files: "csit/suites/{project}/**"

 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:
 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

       - integration-install-robotframework
       - inject:
       - integration-install-robotframework
       - inject:

-          properties-file: 'env.properties'
+          properties-file: "env.properties"

       - integration-get-slave-addresses
       - inject:
       - integration-get-slave-addresses
       - inject:

-          properties-file: 'slave_addresses.txt'
+          properties-file: "slave_addresses.txt"

       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test


@@ -160,17 +159,16 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

       - integration-csit-publish:
       - integration-csit-publish:

-          robot_other_files: ''
+          robot_other_files: ""

           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:

-          openstack-cloud: '{openstack-cloud}'
+          openstack-cloud: "{openstack-cloud}"

       - lf-infra-publish
 
       - lf-infra-publish
 

-

 ######################
 # inttest-csit-1node #
 ######################
 ######################
 # inttest-csit-1node #
 ######################


@@ -186,13 +184,12 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 

-    odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
-    controller-max-mem: '2048m'
-    tools_system_count: '1'
-    tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
-
+    odl_system_flavor: "odl-highcpu-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    controller-max-mem: "2048m"
+    tools_system_count: "1"
+    tools_system_flavor: "odl-highcpu-2"
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     #####################
     # Job configuration #
 
     #####################
     # Job configuration #


@@ -200,71 +197,71 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: '{install}'
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: 'True'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: "{install}"
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "True"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-2-type:
       - integration-stack-2-type:

-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+          vm_0_count: "1"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{tools_system_count}"
+          vm_1_flavor: "{tools_system_flavor}"
+          vm_1_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-stream-test-plan:
       - integration-stream-test-plan:

-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+          stream-test-plan: "{project}-{functionality}-{stream}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{project}-{functionality}.txt'
+          test-plan: "{project}-{functionality}.txt"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$PATCHREFSPEC"
+          branch: "master"

 
     triggers:
       # we need this for not SR projects
       - integration-csit-trigger:
 
     triggers:
       # we need this for not SR projects
       - integration-csit-trigger:

-          jobs: '{trigger-jobs}'
+          jobs: "{trigger-jobs}"

 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:
 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

       - integration-install-robotframework
       - inject:
       - integration-install-robotframework
       - inject:

-          properties-file: 'env.properties'
+          properties-file: "env.properties"

       - integration-get-slave-addresses
       - inject:
       - integration-get-slave-addresses
       - inject:

-          properties-file: 'slave_addresses.txt'
+          properties-file: "slave_addresses.txt"

       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test


@@ -272,166 +269,166 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

       - plot:
       - plot:

-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '180'
+          - title: "{01-plot-title}"
+            yaxis: "{01-plot-yaxis}"
+            group: "{01-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv"

             series:
             series:

-              - file: '{01-plot-data-file}'
-                inclusion-flag: 'off'
+              - file: "{01-plot-data-file}"
+                inclusion-flag: "off"

                 display-table: true
                 format: csv
                 display-table: true
                 format: csv

-          - title: '{02-plot-title}'
-            yaxis: '{02-plot-yaxis}'
-            group: '{02-plot-group}'
-            num-builds: '180'
+          - title: "{02-plot-title}"
+            yaxis: "{02-plot-yaxis}"
+            group: "{02-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv"

             series:
             series:

-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
+              - file: "{02-plot-data-file}"
+                inclusion-flag: "off"

                 display-table: true
                 format: csv
                 display-table: true
                 format: csv

-          - title: '{03-plot-title}'
-            yaxis: '{03-plot-yaxis}'
-            group: '{03-plot-group}'
-            num-builds: '180'
+          - title: "{03-plot-title}"
+            yaxis: "{03-plot-yaxis}"
+            group: "{03-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv"

             series:
             series:

-              - file: '{03-plot-data-file}'
-                inclusion-flag: '{03-inclusion-flag}'
-                exclude: '{03-exclude-value}'
+              - file: "{03-plot-data-file}"
+                inclusion-flag: "{03-inclusion-flag}"
+                exclude: "{03-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{04-plot-title}'
-            yaxis: '{04-plot-yaxis}'
-            group: '{04-plot-group}'
-            num-builds: '180'
+          - title: "{04-plot-title}"
+            yaxis: "{04-plot-yaxis}"
+            group: "{04-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv"

             series:
             series:

-              - file: '{04-plot-data-file}'
-                inclusion-flag: '{04-inclusion-flag}'
-                exclude: '{04-exclude-value}'
+              - file: "{04-plot-data-file}"
+                inclusion-flag: "{04-inclusion-flag}"
+                exclude: "{04-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{05-plot-title}'
-            yaxis: '{05-plot-yaxis}'
-            group: '{05-plot-group}'
-            num-builds: '180'
+          - title: "{05-plot-title}"
+            yaxis: "{05-plot-yaxis}"
+            group: "{05-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv"

             series:
             series:

-              - file: '{05-plot-data-file}'
-                inclusion-flag: '{05-inclusion-flag}'
-                exclude: '{05-exclude-value}'
+              - file: "{05-plot-data-file}"
+                inclusion-flag: "{05-inclusion-flag}"
+                exclude: "{05-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{06-plot-title}'
-            yaxis: '{06-plot-yaxis}'
-            group: '{06-plot-group}'
-            num-builds: '180'
+          - title: "{06-plot-title}"
+            yaxis: "{06-plot-yaxis}"
+            group: "{06-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv"

             series:
             series:

-              - file: '{06-plot-data-file}'
-                inclusion-flag: '{06-inclusion-flag}'
-                exclude: '{06-exclude-value}'
+              - file: "{06-plot-data-file}"
+                inclusion-flag: "{06-inclusion-flag}"
+                exclude: "{06-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{07-plot-title}'
-            yaxis: '{07-plot-yaxis}'
-            group: '{07-plot-group}'
-            num-builds: '180'
+          - title: "{07-plot-title}"
+            yaxis: "{07-plot-yaxis}"
+            group: "{07-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv"

             series:
             series:

-              - file: '{07-plot-data-file}'
-                inclusion-flag: '{07-inclusion-flag}'
-                exclude: '{07-exclude-value}'
+              - file: "{07-plot-data-file}"
+                inclusion-flag: "{07-inclusion-flag}"
+                exclude: "{07-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{08-plot-title}'
-            yaxis: '{08-plot-yaxis}'
-            group: '{08-plot-group}'
-            num-builds: '180'
+          - title: "{08-plot-title}"
+            yaxis: "{08-plot-yaxis}"
+            group: "{08-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv"

             series:
             series:

-              - file: '{08-plot-data-file}'
-                inclusion-flag: '{08-inclusion-flag}'
-                exclude: '{08-exclude-value}'
+              - file: "{08-plot-data-file}"
+                inclusion-flag: "{08-inclusion-flag}"
+                exclude: "{08-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{09-plot-title}'
-            yaxis: '{09-plot-yaxis}'
-            group: '{09-plot-group}'
-            num-builds: '180'
+          - title: "{09-plot-title}"
+            yaxis: "{09-plot-yaxis}"
+            group: "{09-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv"

             series:
             series:

-              - file: '{09-plot-data-file}'
-                inclusion-flag: '{09-inclusion-flag}'
-                exclude: '{09-exclude-value}'
+              - file: "{09-plot-data-file}"
+                inclusion-flag: "{09-inclusion-flag}"
+                exclude: "{09-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{10-plot-title}'
-            yaxis: '{10-plot-yaxis}'
-            group: '{10-plot-group}'
-            num-builds: '180'
+          - title: "{10-plot-title}"
+            yaxis: "{10-plot-yaxis}"
+            group: "{10-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
+            csv-file-name: "{project}-csit-1node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv"

             series:
             series:

-              - file: '{10-plot-data-file}'
-                inclusion-flag: '{10-inclusion-flag}'
-                exclude: '{10-exclude-value}'
+              - file: "{10-plot-data-file}"
+                inclusion-flag: "{10-inclusion-flag}"
+                exclude: "{10-exclude-value}"

                 format: csv
       - integration-csit-publish:
                 format: csv
       - integration-csit-publish:

-          robot_other_files: ''
+          robot_other_files: ""

           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:

-          openstack-cloud: '{openstack-cloud}'
+          openstack-cloud: "{openstack-cloud}"

       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    name: "{prefix}{project}-csit-1node-{functionality}-{install}-{stream}"

     id: inttest-csit-1node
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     <<: *inttest_csit_1node
 
 - job-template:
     id: inttest-csit-1node
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     <<: *inttest_csit_1node
 
 - job-template:

-    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    name: "{prefix}{project}-csit-1node-{functionality}-{install}-{stream}"

     id: inttest-csit-1node-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     id: inttest-csit-1node-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates


@@ -439,51 +436,50 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: '{install}'
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: 'True'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: "{install}"
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "True"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-2-type:
       - integration-stack-2-type:

-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+          vm_0_count: "1"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{tools_system_count}"
+          vm_1_flavor: "{tools_system_flavor}"
+          vm_1_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-stream-test-plan:
       - integration-stream-test-plan:

-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+          stream-test-plan: "{project}-{functionality}-{stream}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{testplan}'
+          test-plan: "{testplan}"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
-
+          karaf-version: "{karaf-version}"

 
 - job-template:
 
 - job-template:

-    name: '{prefix}{project}-csit-verify-3node-{functionality}'
+    name: "{prefix}{project}-csit-verify-3node-{functionality}"

     id: inttest-csit-verify-3node
     <<: *inttest_csit_common
 
     id: inttest-csit-verify-3node
     <<: *inttest_csit_common
 


@@ -495,12 +491,12 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 

-    odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
-    controller-max-mem: '2048m'
-    tools_system_count: '1'
-    tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    odl_system_flavor: "odl-highcpu-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    controller-max-mem: "2048m"
+    tools_system_count: "1"
+    tools_system_flavor: "odl-highcpu-2"
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     #####################
     # Job Configuration #
 
     #####################
     # Job Configuration #


@@ -508,71 +504,71 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           controller-scope: only
           # Controller
           controller-scope: only

-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: 'odl-jolokia,{install-features}'
-          use-features-boot: 'True'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "odl-jolokia,{install-features}"
+          use-features-boot: "True"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-2-type:
       - integration-stack-2-type:

-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+          vm_0_count: "3"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{tools_system_count}"
+          vm_1_flavor: "{tools_system_flavor}"
+          vm_1_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{verify-branch}'
+          branch: "{verify-branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{verify-stream}'
+          stream: "{verify-stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-stream-test-plan:
       - integration-stream-test-plan:

-          stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
+          stream-test-plan: "{project}-{functionality}-{verify-stream}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{project}-{functionality}.txt'
+          test-plan: "{project}-{functionality}.txt"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{verify-jdkversion}'
+          jdkversion: "{verify-jdkversion}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{verify-karaf-version}'
+          karaf-version: "{verify-karaf-version}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     triggers:
       - integration-trigger-patch-submitted:
 
     triggers:
       - integration-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: 'integration/test'
-          branch: 'master'
-          files: 'csit/suites/{project}/**'
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "integration/test"
+          branch: "master"
+          files: "csit/suites/{project}/**"

 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:
 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

       - integration-install-robotframework
       - inject:
       - integration-install-robotframework
       - inject:

-          properties-file: 'env.properties'
+          properties-file: "env.properties"

       - integration-get-slave-addresses
       - inject:
       - integration-get-slave-addresses
       - inject:

-          properties-file: 'slave_addresses.txt'
+          properties-file: "slave_addresses.txt"

       - integration-detect-variables
       - integration-install-common-functions
       - integration-configure-clustering
       - integration-detect-variables
       - integration-install-common-functions
       - integration-configure-clustering


@@ -581,17 +577,16 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

       - integration-csit-publish:
       - integration-csit-publish:

-          robot_other_files: ''
+          robot_other_files: ""

           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:

-          openstack-cloud: '{openstack-cloud}'
+          openstack-cloud: "{openstack-cloud}"

       - lf-infra-publish
 
       - lf-infra-publish
 

-

 ######################
 # inttest-csit-3node #
 ######################
 ######################
 # inttest-csit-3node #
 ######################


@@ -607,12 +602,12 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 

-    odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
-    controller-max-mem: '2048m'
-    tools_system_count: '1'
-    tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    odl_system_flavor: "odl-highcpu-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    controller-max-mem: "2048m"
+    tools_system_count: "1"
+    tools_system_flavor: "odl-highcpu-2"
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     #####################
     # Job configuration #
 
     #####################
     # Job configuration #


@@ -620,71 +615,71 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: '{install}'
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: 'odl-jolokia,{install-features}'
-          use-features-boot: 'True'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: "{install}"
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "odl-jolokia,{install-features}"
+          use-features-boot: "True"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-2-type:
       - integration-stack-2-type:

-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+          vm_0_count: "3"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{tools_system_count}"
+          vm_1_flavor: "{tools_system_flavor}"
+          vm_1_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-stream-test-plan:
       - integration-stream-test-plan:

-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+          stream-test-plan: "{project}-{functionality}-{stream}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{project}-{functionality}.txt'
+          test-plan: "{project}-{functionality}.txt"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$PATCHREFSPEC"
+          branch: "master"

 
     triggers:
       # we need this for not SR projects
       - integration-csit-trigger:
 
     triggers:
       # we need this for not SR projects
       - integration-csit-trigger:

-          jobs: '{trigger-jobs}'
+          jobs: "{trigger-jobs}"

 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:
 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

       - integration-install-robotframework
       - inject:
       - integration-install-robotframework
       - inject:

-          properties-file: 'env.properties'
+          properties-file: "env.properties"

       - integration-get-slave-addresses
       - inject:
       - integration-get-slave-addresses
       - inject:

-          properties-file: 'slave_addresses.txt'
+          properties-file: "slave_addresses.txt"

       - integration-detect-variables
       - integration-install-common-functions
       - integration-configure-clustering
       - integration-detect-variables
       - integration-install-common-functions
       - integration-configure-clustering


@@ -693,166 +688,166 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

       - plot:
       - plot:

-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '180'
+          - title: "{01-plot-title}"
+            yaxis: "{01-plot-yaxis}"
+            group: "{01-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv"

             series:
             series:

-              - file: '{01-plot-data-file}'
-                inclusion-flag: 'off'
+              - file: "{01-plot-data-file}"
+                inclusion-flag: "off"

                 display-table: true
                 format: csv
                 display-table: true
                 format: csv

-          - title: '{02-plot-title}'
-            yaxis: '{02-plot-yaxis}'
-            group: '{02-plot-group}'
-            num-builds: '180'
+          - title: "{02-plot-title}"
+            yaxis: "{02-plot-yaxis}"
+            group: "{02-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv"

             series:
             series:

-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
+              - file: "{02-plot-data-file}"
+                inclusion-flag: "off"

                 display-table: true
                 format: csv
                 display-table: true
                 format: csv

-          - title: '{03-plot-title}'
-            yaxis: '{03-plot-yaxis}'
-            group: '{03-plot-group}'
-            num-builds: '180'
+          - title: "{03-plot-title}"
+            yaxis: "{03-plot-yaxis}"
+            group: "{03-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv"

             series:
             series:

-              - file: '{03-plot-data-file}'
-                inclusion-flag: '{03-inclusion-flag}'
-                exclude: '{03-exclude-value}'
+              - file: "{03-plot-data-file}"
+                inclusion-flag: "{03-inclusion-flag}"
+                exclude: "{03-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{04-plot-title}'
-            yaxis: '{04-plot-yaxis}'
-            group: '{04-plot-group}'
-            num-builds: '180'
+          - title: "{04-plot-title}"
+            yaxis: "{04-plot-yaxis}"
+            group: "{04-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv"

             series:
             series:

-              - file: '{04-plot-data-file}'
-                inclusion-flag: '{04-inclusion-flag}'
-                exclude: '{04-exclude-value}'
+              - file: "{04-plot-data-file}"
+                inclusion-flag: "{04-inclusion-flag}"
+                exclude: "{04-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{05-plot-title}'
-            yaxis: '{05-plot-yaxis}'
-            group: '{05-plot-group}'
-            num-builds: '180'
+          - title: "{05-plot-title}"
+            yaxis: "{05-plot-yaxis}"
+            group: "{05-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv"

             series:
             series:

-              - file: '{05-plot-data-file}'
-                inclusion-flag: '{05-inclusion-flag}'
-                exclude: '{05-exclude-value}'
+              - file: "{05-plot-data-file}"
+                inclusion-flag: "{05-inclusion-flag}"
+                exclude: "{05-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{06-plot-title}'
-            yaxis: '{06-plot-yaxis}'
-            group: '{06-plot-group}'
-            num-builds: '180'
+          - title: "{06-plot-title}"
+            yaxis: "{06-plot-yaxis}"
+            group: "{06-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv"

             series:
             series:

-              - file: '{06-plot-data-file}'
-                inclusion-flag: '{06-inclusion-flag}'
-                exclude: '{06-exclude-value}'
+              - file: "{06-plot-data-file}"
+                inclusion-flag: "{06-inclusion-flag}"
+                exclude: "{06-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{07-plot-title}'
-            yaxis: '{07-plot-yaxis}'
-            group: '{07-plot-group}'
-            num-builds: '180'
+          - title: "{07-plot-title}"
+            yaxis: "{07-plot-yaxis}"
+            group: "{07-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv"

             series:
             series:

-              - file: '{07-plot-data-file}'
-                inclusion-flag: '{07-inclusion-flag}'
-                exclude: '{07-exclude-value}'
+              - file: "{07-plot-data-file}"
+                inclusion-flag: "{07-inclusion-flag}"
+                exclude: "{07-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{08-plot-title}'
-            yaxis: '{08-plot-yaxis}'
-            group: '{08-plot-group}'
-            num-builds: '180'
+          - title: "{08-plot-title}"
+            yaxis: "{08-plot-yaxis}"
+            group: "{08-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv"

             series:
             series:

-              - file: '{08-plot-data-file}'
-                inclusion-flag: '{08-inclusion-flag}'
-                exclude: '{08-exclude-value}'
+              - file: "{08-plot-data-file}"
+                inclusion-flag: "{08-inclusion-flag}"
+                exclude: "{08-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{09-plot-title}'
-            yaxis: '{09-plot-yaxis}'
-            group: '{09-plot-group}'
-            num-builds: '180'
+          - title: "{09-plot-title}"
+            yaxis: "{09-plot-yaxis}"
+            group: "{09-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv"

             series:
             series:

-              - file: '{09-plot-data-file}'
-                inclusion-flag: '{09-inclusion-flag}'
-                exclude: '{09-exclude-value}'
+              - file: "{09-plot-data-file}"
+                inclusion-flag: "{09-inclusion-flag}"
+                exclude: "{09-exclude-value}"

                 format: csv
                 format: csv

-          - title: '{10-plot-title}'
-            yaxis: '{10-plot-yaxis}'
-            group: '{10-plot-group}'
-            num-builds: '180'
+          - title: "{10-plot-title}"
+            yaxis: "{10-plot-yaxis}"
+            group: "{10-plot-group}"
+            num-builds: "180"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv"

             series:
             series:

-              - file: '{10-plot-data-file}'
-                inclusion-flag: '{10-inclusion-flag}'
-                exclude: '{10-exclude-value}'
+              - file: "{10-plot-data-file}"
+                inclusion-flag: "{10-inclusion-flag}"
+                exclude: "{10-exclude-value}"

                 format: csv
       - integration-csit-publish:
                 format: csv
       - integration-csit-publish:

-          robot_other_files: ''
+          robot_other_files: ""

           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:

-          openstack-cloud: '{openstack-cloud}'
+          openstack-cloud: "{openstack-cloud}"

       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    name: "{prefix}{project}-csit-3node-{functionality}-{install}-{stream}"

     id: inttest-csit-3node
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     <<: *inttest_csit_3node
 
 - job-template:
     id: inttest-csit-3node
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     <<: *inttest_csit_3node
 
 - job-template:

-    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    name: "{prefix}{project}-csit-3node-{functionality}-{install}-{stream}"

     id: inttest-csit-3node-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     id: inttest-csit-3node-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates


@@ -860,51 +855,50 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: '{install}'
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: 'odl-jolokia,{install-features}'
-          use-features-boot: 'True'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: "{install}"
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "odl-jolokia,{install-features}"
+          use-features-boot: "True"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-2-type:
       - integration-stack-2-type:

-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+          vm_0_count: "3"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{tools_system_count}"
+          vm_1_flavor: "{tools_system_flavor}"
+          vm_1_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-stream-test-plan:
       - integration-stream-test-plan:

-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+          stream-test-plan: "{project}-{functionality}-{stream}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{testplan}'
+          test-plan: "{testplan}"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
-
+          karaf-version: "{karaf-version}"

 
 - job-template:
 
 - job-template:

-    name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    name: "{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}"

     id: inttest-csit-3node-docker
     <<: *inttest_csit_common
 
     id: inttest-csit-3node-docker
     <<: *inttest_csit_common
 


@@ -917,12 +911,12 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1

-    odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
-    controller-max-mem: '2048m'
-    docker_system_count: '1'
-    docker_system_flavor: 'odl-standard-1'
-    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
+    odl_system_flavor: "odl-highcpu-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    controller-max-mem: "2048m"
+    docker_system_count: "1"
+    docker_system_flavor: "odl-standard-1"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840"

 
     #####################
     # Job Configuration #
 
     #####################
     # Job Configuration #


@@ -930,64 +924,64 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: '{install}'
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: 'odl-jolokia,{install-features}'
-          use-features-boot: 'True'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: "{install}"
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "odl-jolokia,{install-features}"
+          use-features-boot: "True"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-2-type:
       - integration-stack-2-type:

-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{docker_system_count}'
-          vm_1_flavor: '{docker_system_flavor}'
-          vm_1_image: '{docker_system_image}'
+          vm_0_count: "3"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{docker_system_count}"
+          vm_1_flavor: "{docker_system_flavor}"
+          vm_1_image: "{docker_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-stream-test-plan:
       - integration-stream-test-plan:

-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+          stream-test-plan: "{project}-{functionality}-{stream}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{project}-{functionality}.txt'
+          test-plan: "{project}-{functionality}.txt"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$PATCHREFSPEC"
+          branch: "master"

 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:
 
     builders:
       - lf-infra-pre-build
       - integration-stack-2-type:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

       - integration-install-robotframework
       - inject:
       - integration-install-robotframework
       - inject:

-          properties-file: 'env.properties'
+          properties-file: "env.properties"

       - integration-get-slave-addresses
       - inject:
       - integration-get-slave-addresses
       - inject:

-          properties-file: 'slave_addresses.txt'
+          properties-file: "slave_addresses.txt"

       - integration-detect-variables
       - integration-install-common-functions
       - integration-configure-clustering
       - integration-detect-variables
       - integration-install-common-functions
       - integration-configure-clustering


@@ -996,46 +990,45 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

       - plot:
       - plot:

-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '5400'
+          - title: "{01-plot-title}"
+            yaxis: "{01-plot-yaxis}"
+            group: "{01-plot-group}"
+            num-builds: "5400"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv"

             series:
             series:

-              - file: '{01-plot-data-file}'
-                inclusion-flag: 'off'
+              - file: "{01-plot-data-file}"
+                inclusion-flag: "off"

                 display-table: true
                 format: csv
                 display-table: true
                 format: csv

-          - title: '{02-plot-title}'
-            yaxis: '{02-plot-yaxis}'
-            group: '{02-plot-group}'
-            num-builds: '5400'
+          - title: "{02-plot-title}"
+            yaxis: "{02-plot-yaxis}"
+            group: "{02-plot-group}"
+            num-builds: "5400"

             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length

-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: "{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv"

             series:
             series:

-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
+              - file: "{02-plot-data-file}"
+                inclusion-flag: "off"

                 display-table: true
                 format: csv
       - integration-csit-publish:
                 display-table: true
                 format: csv
       - integration-csit-publish:

-          robot_other_files: ''
+          robot_other_files: ""

           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:

-          openstack-cloud: '{openstack-cloud}'
+          openstack-cloud: "{openstack-cloud}"

       - lf-infra-publish
 
       - lf-infra-publish
 

-

 #################################
 # inttest-csit-hwvtep-openstack #
 #################################
 #################################
 # inttest-csit-hwvtep-openstack #
 #################################


@@ -1052,18 +1045,18 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1

-    odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
-    controller-max-mem: '2048m'
+    odl_system_flavor: "odl-highcpu-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    controller-max-mem: "2048m"

     openstack_system_count: 1
     openstack_system_count: 1

-    openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system_flavor: "odl-standard-4"
+    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485"

     openstack_system2_count: 0
     openstack_system2_count: 0

-    openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_flavor: "odl-standard-1"
+    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485"

     tools_system_count: 1
     tools_system_count: 1

-    tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_flavor: "odl-highcpu-2"
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     #####################
     # Job configuration #
 
     #####################
     # Job configuration #


@@ -1071,195 +1064,195 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: ''
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: '{use-features-boot}'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: ""
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "{use-features-boot}"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-4-type:
       - integration-stack-4-type:

-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
+          vm_0_count: "{odl_system_count}"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{openstack_system_count}"
+          vm_1_flavor: "{openstack_system_flavor}"
+          vm_1_image: "{openstack_system_image}"
+          vm_2_count: "{openstack_system2_count}"
+          vm_2_flavor: "{openstack_system2_flavor}"
+          vm_2_image: "{openstack_system2_image}"
+          vm_3_count: "{tools_system_count}"
+          vm_3_flavor: "{tools_system_flavor}"
+          vm_3_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{project}-{functionality}.txt'
+          test-plan: "{project}-{functionality}.txt"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - string:
           name: OPENSTACK_BRANCH
       - string:
           name: OPENSTACK_BRANCH

-          default: '{openstack-branch}'
-          description: 'Openstack version to use with devstack'
+          default: "{openstack-branch}"
+          description: "Openstack version to use with devstack"

       - string:
           name: DEVSTACK_HASH
       - string:
           name: DEVSTACK_HASH

-          default: '{devstack-hash}'
-          description: 'devstack hash to checkout'
+          default: "{devstack-hash}"
+          description: "devstack hash to checkout"

       - string:
           name: ODL_ML2_DRIVER_REPO
       - string:
           name: ODL_ML2_DRIVER_REPO

-          default: '{odl-ml2-driver-repo}'
-          description: 'URL to fetch networking-odl driver'
+          default: "{odl-ml2-driver-repo}"
+          description: "URL to fetch networking-odl driver"

       - string:
           name: ODL_ML2_BRANCH
       - string:
           name: ODL_ML2_BRANCH

-          default: '{odl-ml2-branch}'
-          description: 'Version of networking-odl to checkout from the repo'
+          default: "{odl-ml2-branch}"
+          description: "Version of networking-odl to checkout from the repo"

       - string:
           name: ODL_ML2_DRIVER_VERSION
       - string:
           name: ODL_ML2_DRIVER_VERSION

-          default: '{odl-ml2-driver-version}'
-          description: 'Mode of networking-odl (v1 or v2)'
+          default: "{odl-ml2-driver-version}"
+          description: "Mode of networking-odl (v1 or v2)"

       - string:
           name: ODL_ML2_PORT_BINDING
       - string:
           name: ODL_ML2_PORT_BINDING

-          default: '{odl-ml2-port-binding}'
+          default: "{odl-ml2-port-binding}"

           description: >
             Method of networking-odl port-binding (pseudo-agentdb-binding or
             legacy-port-binding or network-topology)
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO
           description: >
             Method of networking-odl port-binding (pseudo-agentdb-binding or
             legacy-port-binding or network-topology)
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO

-          default: '{devstack-kubernetes-plugin-repo}'
-          description: 'URL to fetch kubernetes devstack plugin'
+          default: "{devstack-kubernetes-plugin-repo}"
+          description: "URL to fetch kubernetes devstack plugin"

       - string:
           name: DEVSTACK_LBAAS_PLUGIN_REPO
       - string:
           name: DEVSTACK_LBAAS_PLUGIN_REPO

-          default: '{devstack-lbaas-plugin-repo}'
-          description: 'URL to fetch neutron-lbaas devstack plugin'
+          default: "{devstack-lbaas-plugin-repo}"
+          description: "URL to fetch neutron-lbaas devstack plugin"

       - string:
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
       - string:
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO

-          default: '{devstack-networking-sfc-plugin-repo}'
-          description: 'URL to fetch neutron-lbaas devstack plugin'
+          default: "{devstack-networking-sfc-plugin-repo}"
+          description: "URL to fetch neutron-lbaas devstack plugin"

       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED

-          default: '{ipsec-vxlan-tunnels-enabled}'
-          description: 'Enable ipsec over vxlan support for all controllers and computes'
+          default: "{ipsec-vxlan-tunnels-enabled}"
+          description: "Enable ipsec over vxlan support for all controllers and computes"

       - string:
           name: PUBLIC_BRIDGE
       - string:
           name: PUBLIC_BRIDGE

-          default: '{public-bridge}'
-          description: 'Specifies public bridge for provider and external networking'
+          default: "{public-bridge}"
+          description: "Specifies public bridge for provider and external networking"

       - string:
           name: ENABLE_HAPROXY_FOR_NEUTRON
       - string:
           name: ENABLE_HAPROXY_FOR_NEUTRON

-          default: '{enable-haproxy}'
-          description: 'Enable HAProxy for using neutron interface as HA'
+          default: "{enable-haproxy}"
+          description: "Enable HAProxy for using neutron interface as HA"

       - string:
           name: ENABLE_OS_SERVICES
       - string:
           name: ENABLE_OS_SERVICES

-          default: '{enable-openstack-services}'
-          description: 'comma separated list of services to enable on controller nodes'
+          default: "{enable-openstack-services}"
+          description: "comma separated list of services to enable on controller nodes"

       - string:
           name: ENABLE_OS_COMPUTE_SERVICES
       - string:
           name: ENABLE_OS_COMPUTE_SERVICES

-          default: '{enable-openstack-compute-services}'
-          description: 'comma separated list of services to enable on compute nodes'
+          default: "{enable-openstack-compute-services}"
+          description: "comma separated list of services to enable on compute nodes"

       - string:
           name: ENABLE_OS_NETWORK_SERVICES
       - string:
           name: ENABLE_OS_NETWORK_SERVICES

-          default: '{enable-openstack-network-services}'
-          description: 'comma seperated list of network services to enable'
+          default: "{enable-openstack-network-services}"
+          description: "comma seperated list of network services to enable"

       - string:
           name: ENABLE_OS_PLUGINS
       - string:
           name: ENABLE_OS_PLUGINS

-          default: '{enable-openstack-plugins}'
-          description: 'comma seperated list of plugins to enable'
+          default: "{enable-openstack-plugins}"
+          description: "comma seperated list of plugins to enable"

       - string:
           name: DISABLE_OS_SERVICES
       - string:
           name: DISABLE_OS_SERVICES

-          default: '{disable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          default: "{disable-openstack-services}"
+          description: "comma seperated list of services to enable"

       - string:
           name: TENANT_NETWORK_TYPE
       - string:
           name: TENANT_NETWORK_TYPE

-          default: '{tenant-network-type}'
-          description: 'Tenant Network Type supported by the implementation'
+          default: "{tenant-network-type}"
+          description: "Tenant Network Type supported by the implementation"

       - string:
           name: SECURITY_GROUP_MODE
       - string:
           name: SECURITY_GROUP_MODE

-          default: '{security-group-mode}'
-          description: 'Security Group Mode to be used in netvirt aclservice config'
+          default: "{security-group-mode}"
+          description: "Security Group Mode to be used in netvirt aclservice config"

       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS
       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS

-          default: '{enable-itm-direct-tunnels}'
-          description: 'Tunnel Configuration mode to be used in genius ifm config'
+          default: "{enable-itm-direct-tunnels}"
+          description: "Tunnel Configuration mode to be used in genius ifm config"

       - string:
           name: PUBLIC_PHYSICAL_NETWORK
       - string:
           name: PUBLIC_PHYSICAL_NETWORK

-          default: '{public-physical-network}'
-          description: 'provider physical network used for flat/vlan networks'
+          default: "{public-physical-network}"
+          description: "provider physical network used for flat/vlan networks"

       - string:
           name: ENABLE_NETWORKING_L2GW
       - string:
           name: ENABLE_NETWORKING_L2GW

-          default: '{enable-networking-l2gw}'
-          description: 'Enable networking L2gw'
+          default: "{enable-networking-l2gw}"
+          description: "Enable networking L2gw"

       - string:
           name: NETWORKING_L2GW_DRIVER
       - string:
           name: NETWORKING_L2GW_DRIVER

-          default: '{networking-l2gw-repo}'
-          description: 'URL to fetch networking-l2gw driver'
+          default: "{networking-l2gw-repo}"
+          description: "URL to fetch networking-l2gw driver"

       - string:
           name: CREATE_INITIAL_NETWORKS
       - string:
           name: CREATE_INITIAL_NETWORKS

-          default: '{create-initial-networks}'
-          description: 'Toggles the option of letting devstack create initial networks (True/False)'
+          default: "{create-initial-networks}"
+          description: "Toggles the option of letting devstack create initial networks (True/False)"

       - string:
           name: LBAAS_SERVICE_PROVIDER
       - string:
           name: LBAAS_SERVICE_PROVIDER

-          default: '{lbaas-service-provider}'
+          default: "{lbaas-service-provider}"

           description: >
             The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in
             local.conf - only relevant when using neutron-lbaas
       - string:
           name: ODL_SFC_DRIVER
           description: >
             The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in
             local.conf - only relevant when using neutron-lbaas
       - string:
           name: ODL_SFC_DRIVER

-          default: '{odl-sfc-driver}'
-          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+          default: "{odl-sfc-driver}"
+          description: "The SFC driver to be used in local.conf - only relevant when using networking-sfc"

       - string:
           name: ODL_SNAT_MODE
       - string:
           name: ODL_SNAT_MODE

-          default: '{odl-snat-mode}'
-          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+          default: "{odl-snat-mode}"
+          description: "The SNAT mode to be configured - options are conntrack/controller."

       - string:
           name: GROUP_ADD_MOD_ENABLED
       - string:
           name: GROUP_ADD_MOD_ENABLED

-          default: '{group-add-mod-enabled}'
-          description: 'The Group add mod enabled mode to be configured - options are true/false.'
+          default: "{group-add-mod-enabled}"
+          description: "The Group add mod enabled mode to be configured - options are true/false."

       - string:
           name: OVS_INSTALL
       - string:
           name: OVS_INSTALL

-          default: '{ovs-install}'
+          default: "{ovs-install}"

           description: >
             Install a custom OVS. It can be an OVS version to build
             (like v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
 
     scm:
       - integration-gerrit-scm:
           description: >
             Install a custom OVS. It can be an OVS version to build
             (like v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$PATCHREFSPEC"
+          branch: "master"

 
     triggers:
 
     triggers:

-      - timed: '{schedule}'
+      - timed: "{schedule}"

 
     builders:
       - lf-infra-pre-build
       - integration-stack-4-type:
 
     builders:
       - lf-infra-pre-build
       - integration-stack-4-type:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

       - integration-install-robotframework
       - inject:
       - integration-install-robotframework
       - inject:

-          properties-file: 'env.properties'
+          properties-file: "env.properties"

       - integration-get-slave-addresses
       - inject:
       - integration-get-slave-addresses
       - inject:

-          properties-file: 'slave_addresses.txt'
+          properties-file: "slave_addresses.txt"

       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test


@@ -1268,8 +1261,8 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

       - integration-csit-collect-netvirt-logs
       - integration-csit-publish:
           robot_other_files:
       - integration-csit-collect-netvirt-logs
       - integration-csit-publish:
           robot_other_files:


@@ -1277,12 +1270,12 @@
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:

-          openstack-cloud: '{openstack-cloud}'
+          openstack-cloud: "{openstack-cloud}"

       - lf-infra-publish
 
 - job-template:
     # yamllint disable-line rule:line-length
       - lf-infra-publish
 
 - job-template:
     # yamllint disable-line rule:line-length

-    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    name: "{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}"

     id: inttest-csit-hwvtep-openstack
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     id: inttest-csit-hwvtep-openstack
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates


@@ -1290,7 +1283,7 @@
 
 - job-template:
     # yamllint disable-line rule:line-length
 
 - job-template:
     # yamllint disable-line rule:line-length

-    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    name: "{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}"

     id: inttest-csit-hwvtep-openstack-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     id: inttest-csit-hwvtep-openstack-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates


@@ -1298,171 +1291,173 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: ''
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: '{use-features-boot}'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: ""
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "{use-features-boot}"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-4-type:
       - integration-stack-4-type:

-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
+          vm_0_count: "{odl_system_count}"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{openstack_system_count}"
+          vm_1_flavor: "{openstack_system_flavor}"
+          vm_1_image: "{openstack_system_image}"
+          vm_2_count: "{openstack_system2_count}"
+          vm_2_flavor: "{openstack_system2_flavor}"
+          vm_2_image: "{openstack_system2_image}"
+          vm_3_count: "{tools_system_count}"
+          vm_3_flavor: "{tools_system_flavor}"
+          vm_3_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{testplan}'
+          test-plan: "{testplan}"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - string:
           name: OPENSTACK_BRANCH
       - string:
           name: OPENSTACK_BRANCH

-          default: '{openstack-branch}'
-          description: 'Openstack version to use with devstack'
+          default: "{openstack-branch}"
+          description: "Openstack version to use with devstack"

       - string:
           name: DEVSTACK_HASH
       - string:
           name: DEVSTACK_HASH

-          default: '{devstack-hash}'
-          description: 'devstack hash to checkout'
+          default: "{devstack-hash}"
+          description: "devstack hash to checkout"

       - string:
           name: ODL_ML2_DRIVER_REPO
       - string:
           name: ODL_ML2_DRIVER_REPO

-          default: '{odl-ml2-driver-repo}'
-          description: 'URL to fetch networking-odl driver'
+          default: "{odl-ml2-driver-repo}"
+          description: "URL to fetch networking-odl driver"

       - string:
           name: ODL_ML2_BRANCH
       - string:
           name: ODL_ML2_BRANCH

-          default: '{odl-ml2-branch}'
-          description: 'Version of networking-odl to checkout from the repo'
+          default: "{odl-ml2-branch}"
+          description: "Version of networking-odl to checkout from the repo"

       - string:
           name: ODL_ML2_DRIVER_VERSION
       - string:
           name: ODL_ML2_DRIVER_VERSION

-          default: '{odl-ml2-driver-version}'
-          description: 'Mode of networking-odl (v1 or v2)'
+          default: "{odl-ml2-driver-version}"
+          description: "Mode of networking-odl (v1 or v2)"

       - string:
           name: ODL_ML2_PORT_BINDING
       - string:
           name: ODL_ML2_PORT_BINDING

-          default: '{odl-ml2-port-binding}'
-          description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
-          network-topology)'
+          default: "{odl-ml2-port-binding}"
+          description: |
+            Method of networking-odl port-binding (pseudo-agentdb-binding or
+            legacy-port-binding or network-topology)

       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO

-          default: '{devstack-kubernetes-plugin-repo}'
-          description: 'URL to fetch kubernetes devstack plugin'
+          default: "{devstack-kubernetes-plugin-repo}"
+          description: "URL to fetch kubernetes devstack plugin"

       - string:
           name: DEVSTACK_LBAAS_PLUGIN_REPO
       - string:
           name: DEVSTACK_LBAAS_PLUGIN_REPO

-          default: '{devstack-lbaas-plugin-repo}'
-          description: 'URL to fetch neutron-lbaas devstack plugin'
+          default: "{devstack-lbaas-plugin-repo}"
+          description: "URL to fetch neutron-lbaas devstack plugin"

       - string:
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
       - string:
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO

-          default: '{devstack-networking-sfc-plugin-repo}'
-          description: 'URL to fetch neutron-lbaas devstack plugin'
+          default: "{devstack-networking-sfc-plugin-repo}"
+          description: "URL to fetch neutron-lbaas devstack plugin"

       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED

-          default: '{ipsec-vxlan-tunnels-enabled}'
-          description: 'Enable ipsec over vxlan support for all controllers and computes'
+          default: "{ipsec-vxlan-tunnels-enabled}"
+          description: "Enable ipsec over vxlan support for all controllers and computes"

       - string:
           name: PUBLIC_BRIDGE
       - string:
           name: PUBLIC_BRIDGE

-          default: '{public-bridge}'
-          description: 'Specifies public bridge for provider and external networking'
+          default: "{public-bridge}"
+          description: "Specifies public bridge for provider and external networking"

       - string:
           name: ENABLE_HAPROXY_FOR_NEUTRON
       - string:
           name: ENABLE_HAPROXY_FOR_NEUTRON

-          default: '{enable-haproxy}'
-          description: 'Enable HAProxy for using neutron interface as HA'
+          default: "{enable-haproxy}"
+          description: "Enable HAProxy for using neutron interface as HA"

       - string:
           name: ENABLE_OS_SERVICES
       - string:
           name: ENABLE_OS_SERVICES

-          default: '{enable-openstack-services}'
-          description: 'comma separated list of services to enable on controller nodes'
+          default: "{enable-openstack-services}"
+          description: "comma separated list of services to enable on controller nodes"

       - string:
           name: ENABLE_OS_COMPUTE_SERVICES
       - string:
           name: ENABLE_OS_COMPUTE_SERVICES

-          default: '{enable-openstack-compute-services}'
-          description: 'comma separated list of services to enable on compute nodes'
+          default: "{enable-openstack-compute-services}"
+          description: "comma separated list of services to enable on compute nodes"

       - string:
           name: ENABLE_OS_NETWORK_SERVICES
       - string:
           name: ENABLE_OS_NETWORK_SERVICES

-          default: '{enable-openstack-network-services}'
-          description: 'comma seperated list of network services to enable'
+          default: "{enable-openstack-network-services}"
+          description: "comma seperated list of network services to enable"

       - string:
           name: ENABLE_OS_PLUGINS
       - string:
           name: ENABLE_OS_PLUGINS

-          default: '{enable-openstack-plugins}'
-          description: 'comma seperated list of plugins to enable'
+          default: "{enable-openstack-plugins}"
+          description: "comma seperated list of plugins to enable"

       - string:
           name: DISABLE_OS_SERVICES
       - string:
           name: DISABLE_OS_SERVICES

-          default: '{disable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          default: "{disable-openstack-services}"
+          description: "comma seperated list of services to enable"

       - string:
           name: TENANT_NETWORK_TYPE
       - string:
           name: TENANT_NETWORK_TYPE

-          default: '{tenant-network-type}'
-          description: 'Tenant Network Type supported by the implementation'
+          default: "{tenant-network-type}"
+          description: "Tenant Network Type supported by the implementation"

       - string:
           name: SECURITY_GROUP_MODE
       - string:
           name: SECURITY_GROUP_MODE

-          default: '{security-group-mode}'
-          description: 'Security Group Mode to be used in netvirt aclservice config'
+          default: "{security-group-mode}"
+          description: "Security Group Mode to be used in netvirt aclservice config"

       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS
       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS

-          default: '{enable-itm-direct-tunnels}'
-          description: 'Tunnel Configuration mode to be used in genius ifm config'
+          default: "{enable-itm-direct-tunnels}"
+          description: "Tunnel Configuration mode to be used in genius ifm config"

       - string:
           name: PUBLIC_PHYSICAL_NETWORK
       - string:
           name: PUBLIC_PHYSICAL_NETWORK

-          default: '{public-physical-network}'
-          description: 'provider physical network used for flat/vlan networks'
+          default: "{public-physical-network}"
+          description: "provider physical network used for flat/vlan networks"

       - string:
           name: ENABLE_NETWORKING_L2GW
       - string:
           name: ENABLE_NETWORKING_L2GW

-          default: '{enable-networking-l2gw}'
-          description: 'Enable networking L2gw'
+          default: "{enable-networking-l2gw}"
+          description: "Enable networking L2gw"

       - string:
           name: NETWORKING_L2GW_DRIVER
       - string:
           name: NETWORKING_L2GW_DRIVER

-          default: '{networking-l2gw-repo}'
-          description: 'URL to fetch networking-l2gw driver'
+          default: "{networking-l2gw-repo}"
+          description: "URL to fetch networking-l2gw driver"

       - string:
           name: CREATE_INITIAL_NETWORKS
       - string:
           name: CREATE_INITIAL_NETWORKS

-          default: '{create-initial-networks}'
-          description: 'Toggles the option of letting devstack create initial networks (True/False)'
+          default: "{create-initial-networks}"
+          description: "Toggles the option of letting devstack create initial networks (True/False)"

       - string:
           name: LBAAS_SERVICE_PROVIDER
       - string:
           name: LBAAS_SERVICE_PROVIDER

-          default: '{lbaas-service-provider}'
-          description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
-          neutron-lbaas'
+          default: "{lbaas-service-provider}"
+          description: |
+            The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf
+            - only relevant when using neutron-lbaas

       - string:
           name: ODL_SFC_DRIVER
       - string:
           name: ODL_SFC_DRIVER

-          default: '{odl-sfc-driver}'
-          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+          default: "{odl-sfc-driver}"
+          description: "The SFC driver to be used in local.conf - only relevant when using networking-sfc"

       - string:
           name: ODL_SNAT_MODE
       - string:
           name: ODL_SNAT_MODE

-          default: '{odl-snat-mode}'
-          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+          default: "{odl-snat-mode}"
+          description: "The SNAT mode to be configured - options are conntrack/controller."

       - string:
           name: GROUP_ADD_MOD_ENABLED
       - string:
           name: GROUP_ADD_MOD_ENABLED

-          default: '{group-add-mod-enabled}'
-          description: 'The Group add mod enabled mode to be configured - options are true/false.'
+          default: "{group-add-mod-enabled}"
+          description: "The Group add mod enabled mode to be configured - options are true/false."

       - string:
           name: OVS_INSTALL
       - string:
           name: OVS_INSTALL

-          default: '{ovs-install}'
-          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
-          repo url to pull from.'
-
+          default: "{ovs-install}"
+          description: |
+            Install a custom OVS. It can be an OVS version to build (like
+            v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.

 
 ##########################
 # inttest-csit-openstack #
 
 ##########################
 # inttest-csit-openstack #


@@ -1480,18 +1475,18 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1
     openstack-heat-template-dir: openstack-hot
 
     odl_system_count: 1

-    odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474'
-    controller-max-mem: '2048m'
+    odl_system_flavor: "odl-highcpu-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474"
+    controller-max-mem: "2048m"

     openstack_system_count: 1
     openstack_system_count: 1

-    openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system_flavor: "odl-standard-4"
+    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485"

     openstack_system2_count: 0
     openstack_system2_count: 0

-    openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_flavor: "odl-standard-1"
+    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485"

     tools_system_count: 1
     tools_system_count: 1

-    tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_flavor: "odl-highcpu-2"
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     #####################
     # Job configuration #
 
     #####################
     # Job configuration #


@@ -1499,196 +1494,199 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: ''
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: '{use-features-boot}'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: ""
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "{use-features-boot}"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-4-type:
       - integration-stack-4-type:

-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
+          vm_0_count: "{odl_system_count}"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{openstack_system_count}"
+          vm_1_flavor: "{openstack_system_flavor}"
+          vm_1_image: "{openstack_system_image}"
+          vm_2_count: "{openstack_system2_count}"
+          vm_2_flavor: "{openstack_system2_flavor}"
+          vm_2_image: "{openstack_system2_image}"
+          vm_3_count: "{tools_system_count}"
+          vm_3_flavor: "{tools_system_flavor}"
+          vm_3_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{project}-{functionality}.txt'
+          test-plan: "{project}-{functionality}.txt"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - string:
           name: OPENSTACK_BRANCH
       - string:
           name: OPENSTACK_BRANCH

-          default: '{openstack-branch}'
-          description: 'Openstack version to use with devstack'
+          default: "{openstack-branch}"
+          description: "Openstack version to use with devstack"

       - string:
           name: DEVSTACK_HASH
       - string:
           name: DEVSTACK_HASH

-          default: '{devstack-hash}'
-          description: 'devstack hash to checkout'
+          default: "{devstack-hash}"
+          description: "devstack hash to checkout"

       - string:
           name: ODL_ML2_DRIVER_REPO
       - string:
           name: ODL_ML2_DRIVER_REPO

-          default: '{odl-ml2-driver-repo}'
-          description: 'URL to fetch networking-odl driver'
+          default: "{odl-ml2-driver-repo}"
+          description: "URL to fetch networking-odl driver"

       - string:
           name: ODL_ML2_BRANCH
       - string:
           name: ODL_ML2_BRANCH

-          default: '{odl-ml2-branch}'
-          description: 'Version of networking-odl to checkout from the repo'
+          default: "{odl-ml2-branch}"
+          description: "Version of networking-odl to checkout from the repo"

       - string:
           name: ODL_ML2_DRIVER_VERSION
       - string:
           name: ODL_ML2_DRIVER_VERSION

-          default: '{odl-ml2-driver-version}'
-          description: 'Mode of networking-odl (v1 or v2)'
+          default: "{odl-ml2-driver-version}"
+          description: "Mode of networking-odl (v1 or v2)"

       - string:
           name: ODL_ML2_PORT_BINDING
       - string:
           name: ODL_ML2_PORT_BINDING

-          default: '{odl-ml2-port-binding}'
-          description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
-          network-topology)'
+          default: "{odl-ml2-port-binding}"
+          description: |
+            Method of networking-odl port-binding (pseudo-agentdb-binding or
+            legacy-port-binding or network-topology)

       - string:
           name: ENABLE_GRE_TYPE_DRIVERS
       - string:
           name: ENABLE_GRE_TYPE_DRIVERS

-          default: '{enable-gre-type-driver}'
-          description: 'Enable gre tunnel'
+          default: "{enable-gre-type-driver}"
+          description: "Enable gre tunnel"

       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO

-          default: '{devstack-kubernetes-plugin-repo}'
-          description: 'URL to fetch kubernetes devstack plugin'
+          default: "{devstack-kubernetes-plugin-repo}"
+          description: "URL to fetch kubernetes devstack plugin"

       - string:
           name: DEVSTACK_LBAAS_PLUGIN_REPO
       - string:
           name: DEVSTACK_LBAAS_PLUGIN_REPO

-          default: '{devstack-lbaas-plugin-repo}'
-          description: 'URL to fetch neutron-lbaas devstack plugin'
+          default: "{devstack-lbaas-plugin-repo}"
+          description: "URL to fetch neutron-lbaas devstack plugin"

       - string:
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
       - string:
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO

-          default: '{devstack-networking-sfc-plugin-repo}'
-          description: 'URL to fetch neutron-lbaas devstack plugin'
+          default: "{devstack-networking-sfc-plugin-repo}"
+          description: "URL to fetch neutron-lbaas devstack plugin"

       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED

-          default: '{ipsec-vxlan-tunnels-enabled}'
-          description: 'Enable ipsec over vxlan support for all controllers and computes'
+          default: "{ipsec-vxlan-tunnels-enabled}"
+          description: "Enable ipsec over vxlan support for all controllers and computes"

       - string:
           name: PUBLIC_BRIDGE
       - string:
           name: PUBLIC_BRIDGE

-          default: '{public-bridge}'
-          description: 'Specifies public bridge for provider and external networking'
+          default: "{public-bridge}"
+          description: "Specifies public bridge for provider and external networking"

       - string:
           name: ENABLE_HAPROXY_FOR_NEUTRON
       - string:
           name: ENABLE_HAPROXY_FOR_NEUTRON

-          default: '{enable-haproxy}'
-          description: 'Enable HAProxy for using neutron interface as HA'
+          default: "{enable-haproxy}"
+          description: "Enable HAProxy for using neutron interface as HA"

       - string:
           name: ENABLE_OS_SERVICES
       - string:
           name: ENABLE_OS_SERVICES

-          default: '{enable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          default: "{enable-openstack-services}"
+          description: "comma seperated list of services to enable"

       - string:
           name: ENABLE_OS_COMPUTE_SERVICES
       - string:
           name: ENABLE_OS_COMPUTE_SERVICES

-          default: '{enable-openstack-compute-services}'
-          description: 'comma separated list of services to enable on compute nodes'
+          default: "{enable-openstack-compute-services}"
+          description: "comma separated list of services to enable on compute nodes"

       - string:
           name: ENABLE_OS_NETWORK_SERVICES
       - string:
           name: ENABLE_OS_NETWORK_SERVICES

-          default: '{enable-openstack-network-services}'
-          description: 'comma seperated list of network services to enable'
+          default: "{enable-openstack-network-services}"
+          description: "comma seperated list of network services to enable"

       - string:
           name: ENABLE_OS_PLUGINS
       - string:
           name: ENABLE_OS_PLUGINS

-          default: '{enable-openstack-plugins}'
-          description: 'comma seperated list of plugins to enable'
+          default: "{enable-openstack-plugins}"
+          description: "comma seperated list of plugins to enable"

       - string:
           name: DISABLE_OS_SERVICES
       - string:
           name: DISABLE_OS_SERVICES

-          default: '{disable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          default: "{disable-openstack-services}"
+          description: "comma seperated list of services to enable"

       - string:
           name: TENANT_NETWORK_TYPE
       - string:
           name: TENANT_NETWORK_TYPE

-          default: '{tenant-network-type}'
-          description: 'Tenant Network Type supported by the implementation'
+          default: "{tenant-network-type}"
+          description: "Tenant Network Type supported by the implementation"

       - string:
           name: SECURITY_GROUP_MODE
       - string:
           name: SECURITY_GROUP_MODE

-          default: '{security-group-mode}'
-          description: 'Security Group Mode to be used in netvirt aclservice config'
+          default: "{security-group-mode}"
+          description: "Security Group Mode to be used in netvirt aclservice config"

       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS
       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS

-          default: '{enable-itm-direct-tunnels}'
-          description: 'Tunnel Configuration mode to be used in genius ifm config'
+          default: "{enable-itm-direct-tunnels}"
+          description: "Tunnel Configuration mode to be used in genius ifm config"

       - string:
           name: PUBLIC_PHYSICAL_NETWORK
       - string:
           name: PUBLIC_PHYSICAL_NETWORK

-          default: '{public-physical-network}'
-          description: 'provider physical network used for flat/vlan networks'
+          default: "{public-physical-network}"
+          description: "provider physical network used for flat/vlan networks"

       - string:
           name: ENABLE_NETWORKING_L2GW
       - string:
           name: ENABLE_NETWORKING_L2GW

-          default: '{enable-networking-l2gw}'
-          description: 'Enable networking L2gw'
+          default: "{enable-networking-l2gw}"
+          description: "Enable networking L2gw"

       - string:
           name: NETWORKING_L2GW_DRIVER
       - string:
           name: NETWORKING_L2GW_DRIVER

-          default: '{networking-l2gw-repo}'
-          description: 'URL to fetch networking-l2gw driver'
+          default: "{networking-l2gw-repo}"
+          description: "URL to fetch networking-l2gw driver"

       - string:
           name: CREATE_INITIAL_NETWORKS
       - string:
           name: CREATE_INITIAL_NETWORKS

-          default: '{create-initial-networks}'
-          description: 'Toggles the option of letting devstack create initial networks (True/False)'
+          default: "{create-initial-networks}"
+          description: "Toggles the option of letting devstack create initial networks (True/False)"

       - string:
           name: LBAAS_SERVICE_PROVIDER
       - string:
           name: LBAAS_SERVICE_PROVIDER

-          default: '{lbaas-service-provider}'
-          description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
-          neutron-lbaas'
+          default: "{lbaas-service-provider}"
+          description: |
+            The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf
+            - only relevant when using neutron-lbaas

       - string:
           name: ODL_SFC_DRIVER
       - string:
           name: ODL_SFC_DRIVER

-          default: '{odl-sfc-driver}'
-          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+          default: "{odl-sfc-driver}"
+          description: "The SFC driver to be used in local.conf - only relevant when using networking-sfc"

       - string:
           name: ODL_SNAT_MODE
       - string:
           name: ODL_SNAT_MODE

-          default: '{odl-snat-mode}'
-          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+          default: "{odl-snat-mode}"
+          description: "The SNAT mode to be configured - options are conntrack/controller."

       - string:
           name: GROUP_ADD_MOD_ENABLED
       - string:
           name: GROUP_ADD_MOD_ENABLED

-          default: '{group-add-mod-enabled}'
-          description: 'The Group add mod enabled mode to be configured - options are true/false.'
+          default: "{group-add-mod-enabled}"
+          description: "The Group add mod enabled mode to be configured - options are true/false."

       - string:
           name: OVS_INSTALL
       - string:
           name: OVS_INSTALL

-          default: '{ovs-install}'
-          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
-          repo url to pull from.'
+          default: "{ovs-install}"
+          description: |
+            Install a custom OVS. It can be an OVS version to build (like
+            v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$PATCHREFSPEC"
+          branch: "master"

 
     triggers:
 
     triggers:

-      - timed: '{schedule}'
+      - timed: "{schedule}"

 
     builders:
       - lf-infra-pre-build
       - integration-stack-4-type:
 
     builders:
       - lf-infra-pre-build
       - integration-stack-4-type:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

       - integration-install-robotframework
       - inject:
       - integration-install-robotframework
       - inject:

-          properties-file: 'env.properties'
+          properties-file: "env.properties"

       - integration-get-slave-addresses
       - inject:
       - integration-get-slave-addresses
       - inject:

-          properties-file: 'slave_addresses.txt'
+          properties-file: "slave_addresses.txt"

       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test


@@ -1697,8 +1695,8 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

       - integration-csit-collect-netvirt-logs
       - integration-csit-publish:
           robot_other_files:
       - integration-csit-collect-netvirt-logs
       - integration-csit-publish:
           robot_other_files:


@@ -1706,12 +1704,12 @@
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:

-          openstack-cloud: '{openstack-cloud}'
+          openstack-cloud: "{openstack-cloud}"

       - lf-infra-publish
 
 - job-template:
     # yamllint disable-line rule:line-length
       - lf-infra-publish
 
 - job-template:
     # yamllint disable-line rule:line-length

-    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}"

     id: inttest-csit-openstack
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     id: inttest-csit-openstack
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates


@@ -1719,7 +1717,7 @@
 
 - job-template:
     # yamllint disable-line rule:line-length
 
 - job-template:
     # yamllint disable-line rule:line-length

-    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}"

     id: inttest-csit-openstack-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     id: inttest-csit-openstack-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates


@@ -1727,174 +1725,177 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: ''
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: '{use-features-boot}'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: ""
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "{use-features-boot}"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-4-type:
       - integration-stack-4-type:

-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
+          vm_0_count: "{odl_system_count}"
+          vm_0_flavor: "{odl_system_flavor}"
+          vm_0_image: "{odl_system_image}"
+          vm_1_count: "{openstack_system_count}"
+          vm_1_flavor: "{openstack_system_flavor}"
+          vm_1_image: "{openstack_system_image}"
+          vm_2_count: "{openstack_system2_count}"
+          vm_2_flavor: "{openstack_system2_flavor}"
+          vm_2_image: "{openstack_system2_image}"
+          vm_3_count: "{tools_system_count}"
+          vm_3_flavor: "{tools_system_flavor}"
+          vm_3_image: "{tools_system_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-script-plan:
       - integration-script-plan:

-          script-plan: '{project}.txt'
+          script-plan: "{project}.txt"

       - integration-config-plan:
       - integration-config-plan:

-          config-plan: '{project}.txt'
+          config-plan: "{project}.txt"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{testplan}'
+          test-plan: "{testplan}"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - string:
           name: OPENSTACK_BRANCH
       - string:
           name: OPENSTACK_BRANCH

-          default: '{openstack-branch}'
-          description: 'Openstack version to use with devstack'
+          default: "{openstack-branch}"
+          description: "Openstack version to use with devstack"

       - string:
           name: DEVSTACK_HASH
       - string:
           name: DEVSTACK_HASH

-          default: '{devstack-hash}'
-          description: 'devstack hash to checkout'
+          default: "{devstack-hash}"
+          description: "devstack hash to checkout"

       - string:
           name: ODL_ML2_DRIVER_REPO
       - string:
           name: ODL_ML2_DRIVER_REPO

-          default: '{odl-ml2-driver-repo}'
-          description: 'URL to fetch networking-odl driver'
+          default: "{odl-ml2-driver-repo}"
+          description: "URL to fetch networking-odl driver"

       - string:
           name: ODL_ML2_BRANCH
       - string:
           name: ODL_ML2_BRANCH

-          default: '{odl-ml2-branch}'
-          description: 'Version of networking-odl to checkout from the repo'
+          default: "{odl-ml2-branch}"
+          description: "Version of networking-odl to checkout from the repo"

       - string:
           name: ODL_ML2_DRIVER_VERSION
       - string:
           name: ODL_ML2_DRIVER_VERSION

-          default: '{odl-ml2-driver-version}'
-          description: 'Mode of networking-odl (v1 or v2)'
+          default: "{odl-ml2-driver-version}"
+          description: "Mode of networking-odl (v1 or v2)"

       - string:
           name: ODL_ML2_PORT_BINDING
       - string:
           name: ODL_ML2_PORT_BINDING

-          default: '{odl-ml2-port-binding}'
-          description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
-          network-topology)'
+          default: "{odl-ml2-port-binding}"
+          description: |
+            Method of networking-odl port-binding (pseudo-agentdb-binding or
+            legacy-port-binding or network-topology)

       - string:
           name: ENABLE_GRE_TYPE_DRIVERS
       - string:
           name: ENABLE_GRE_TYPE_DRIVERS

-          default: '{enable-gre-type-driver}'
-          description: 'Enable gre tunnel'
+          default: "{enable-gre-type-driver}"
+          description: "Enable gre tunnel"

       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO

-          default: '{devstack-kubernetes-plugin-repo}'
-          description: 'URL to fetch kubernetes devstack plugin'
+          default: "{devstack-kubernetes-plugin-repo}"
+          description: "URL to fetch kubernetes devstack plugin"

       - string:
           name: DEVSTACK_LBAAS_PLUGIN_REPO
       - string:
           name: DEVSTACK_LBAAS_PLUGIN_REPO

-          default: '{devstack-lbaas-plugin-repo}'
-          description: 'URL to fetch neutron-lbaas devstack plugin'
+          default: "{devstack-lbaas-plugin-repo}"
+          description: "URL to fetch neutron-lbaas devstack plugin"

       - string:
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
       - string:
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO

-          default: '{devstack-networking-sfc-plugin-repo}'
-          description: 'URL to fetch neutron-lbaas devstack plugin'
+          default: "{devstack-networking-sfc-plugin-repo}"
+          description: "URL to fetch neutron-lbaas devstack plugin"

       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED

-          default: '{ipsec-vxlan-tunnels-enabled}'
-          description: 'Enable ipsec over vxlan support for all controllers and computes'
+          default: "{ipsec-vxlan-tunnels-enabled}"
+          description: "Enable ipsec over vxlan support for all controllers and computes"

       - string:
           name: PUBLIC_BRIDGE
       - string:
           name: PUBLIC_BRIDGE

-          default: '{public-bridge}'
-          description: 'Specifies public bridge for provider and external networking'
+          default: "{public-bridge}"
+          description: "Specifies public bridge for provider and external networking"

       - string:
           name: ENABLE_HAPROXY_FOR_NEUTRON
       - string:
           name: ENABLE_HAPROXY_FOR_NEUTRON

-          default: '{enable-haproxy}'
-          description: 'Enable HAProxy for using neutron interface as HA'
+          default: "{enable-haproxy}"
+          description: "Enable HAProxy for using neutron interface as HA"

       - string:
           name: ENABLE_OS_SERVICES
       - string:
           name: ENABLE_OS_SERVICES

-          default: '{enable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          default: "{enable-openstack-services}"
+          description: "comma seperated list of services to enable"

       - string:
           name: ENABLE_OS_COMPUTE_SERVICES
       - string:
           name: ENABLE_OS_COMPUTE_SERVICES

-          default: '{enable-openstack-compute-services}'
-          description: 'comma separated list of services to enable on compute nodes'
+          default: "{enable-openstack-compute-services}"
+          description: "comma separated list of services to enable on compute nodes"

       - string:
           name: ENABLE_OS_NETWORK_SERVICES
       - string:
           name: ENABLE_OS_NETWORK_SERVICES

-          default: '{enable-openstack-network-services}'
-          description: 'comma seperated list of network services to enable'
+          default: "{enable-openstack-network-services}"
+          description: "comma seperated list of network services to enable"

       - string:
           name: ENABLE_OS_PLUGINS
       - string:
           name: ENABLE_OS_PLUGINS

-          default: '{enable-openstack-plugins}'
-          description: 'comma seperated list of plugins to enable'
+          default: "{enable-openstack-plugins}"
+          description: "comma seperated list of plugins to enable"

       - string:
           name: DISABLE_OS_SERVICES
       - string:
           name: DISABLE_OS_SERVICES

-          default: '{disable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          default: "{disable-openstack-services}"
+          description: "comma seperated list of services to enable"

       - string:
           name: TENANT_NETWORK_TYPE
       - string:
           name: TENANT_NETWORK_TYPE

-          default: '{tenant-network-type}'
-          description: 'Tenant Network Type supported by the implementation'
+          default: "{tenant-network-type}"
+          description: "Tenant Network Type supported by the implementation"

       - string:
           name: SECURITY_GROUP_MODE
       - string:
           name: SECURITY_GROUP_MODE

-          default: '{security-group-mode}'
-          description: 'Security Group Mode to be used in netvirt aclservice config'
+          default: "{security-group-mode}"
+          description: "Security Group Mode to be used in netvirt aclservice config"

       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS
       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS

-          default: '{enable-itm-direct-tunnels}'
-          description: 'Tunnel Configuration mode to be used in genius ifm config'
+          default: "{enable-itm-direct-tunnels}"
+          description: "Tunnel Configuration mode to be used in genius ifm config"

       - string:
           name: PUBLIC_PHYSICAL_NETWORK
       - string:
           name: PUBLIC_PHYSICAL_NETWORK

-          default: '{public-physical-network}'
-          description: 'provider physical network used for flat/vlan networks'
+          default: "{public-physical-network}"
+          description: "provider physical network used for flat/vlan networks"

       - string:
           name: ENABLE_NETWORKING_L2GW
       - string:
           name: ENABLE_NETWORKING_L2GW

-          default: '{enable-networking-l2gw}'
-          description: 'Enable networking L2gw'
+          default: "{enable-networking-l2gw}"
+          description: "Enable networking L2gw"

       - string:
           name: NETWORKING_L2GW_DRIVER
       - string:
           name: NETWORKING_L2GW_DRIVER

-          default: '{networking-l2gw-repo}'
-          description: 'URL to fetch networking-l2gw driver'
+          default: "{networking-l2gw-repo}"
+          description: "URL to fetch networking-l2gw driver"

       - string:
           name: CREATE_INITIAL_NETWORKS
       - string:
           name: CREATE_INITIAL_NETWORKS

-          default: '{create-initial-networks}'
-          description: 'Toggles the option of letting devstack create initial networks (True/False)'
+          default: "{create-initial-networks}"
+          description: "Toggles the option of letting devstack create initial networks (True/False)"

       - string:
           name: LBAAS_SERVICE_PROVIDER
       - string:
           name: LBAAS_SERVICE_PROVIDER

-          default: '{lbaas-service-provider}'
-          description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
-          neutron-lbaas'
+          default: "{lbaas-service-provider}"
+          description: |
+            The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf
+            - only relevant when using neutron-lbaas

       - string:
           name: ODL_SFC_DRIVER
       - string:
           name: ODL_SFC_DRIVER

-          default: '{odl-sfc-driver}'
-          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+          default: "{odl-sfc-driver}"
+          description: "The SFC driver to be used in local.conf - only relevant when using networking-sfc"

       - string:
           name: ODL_SNAT_MODE
       - string:
           name: ODL_SNAT_MODE

-          default: '{odl-snat-mode}'
-          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+          default: "{odl-snat-mode}"
+          description: "The SNAT mode to be configured - options are conntrack/controller."

       - string:
           name: GROUP_ADD_MOD_ENABLED
       - string:
           name: GROUP_ADD_MOD_ENABLED

-          default: '{group-add-mod-enabled}'
-          description: 'The Group add mod enabled mode to be configured - options are true/false.'
+          default: "{group-add-mod-enabled}"
+          description: "The Group add mod enabled mode to be configured - options are true/false."

       - string:
           name: OVS_INSTALL
       - string:
           name: OVS_INSTALL

-          default: '{ovs-install}'
-          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
-          repo url to pull from.'
+          default: "{ovs-install}"
+          description: |
+            Install a custom OVS. It can be an OVS version to build (like
+            v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.

 
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change
 
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change


@@ -1902,7 +1903,7 @@
 # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:
 # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:

-    name: '{prefix}{project}-patch-test-{feature}-{stream}'
+    name: "{prefix}{project}-patch-test-{feature}-{stream}"

     id: inttest-patch-test
     <<: *inttest_csit_common
 
     id: inttest-patch-test
     <<: *inttest_csit_common
 


@@ -1910,46 +1911,46 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - integration-distribution-git-url:
       - integration-distribution-git-url:

-          git-url: '{git-url}'
+          git-url: "{git-url}"

       - string:
           name: feature
       - string:
           name: feature

-          default: 'all'
-          description: 'Specific feature test for patch'
+          default: "all"
+          description: "Specific feature test for patch"

       - maven-exec:
           maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
       - maven-exec:
           maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:

-          basedir: '{project}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          basedir: "{project}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

       - integration-distribution-scm:
       - integration-distribution-scm:

-          branch: '{branch}'
+          branch: "{branch}"

 
     triggers:
       - gerrit:
 
     triggers:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - comment-added-contains-event:
           trigger-on:
             - comment-added-contains-event:

-                comment-contains-value: 'test-{project}-all'
+                comment-contains-value: "test-{project}-all"

             - comment-added-contains-event:
             - comment-added-contains-event:

-                comment-contains-value: 'test-{project}-{feature}'
+                comment-contains-value: "test-{project}-{feature}"

           projects:
           projects:

-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"

               branches:
               branches:

-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"

           skip-vote:
             successful: true
             failed: true
           skip-vote:
             successful: true
             failed: true


@@ -1960,21 +1961,21 @@
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - lf-update-java-alternatives:
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - lf-update-java-alternatives:

-          java-version: '{java-version}'
+          java-version: "{java-version}"

       - maven-target:
           maven-version: mvn35
       - maven-target:
           maven-version: mvn35

-          pom: '{project}/pom.xml'
+          pom: "{project}/pom.xml"

           goals: |
           goals: |

-              clean install dependency:tree
-              -Pq
-              -Dgitid.skip=false
-              -Dmaven.gitcommitid.skip=false
-              -DgenerateReports=false
-              -Dstream={stream}
-              {opendaylight-infra-mvn-opts}
+            clean install dependency:tree
+            -Pq
+            -Dgitid.skip=false
+            -Dmaven.gitcommitid.skip=false
+            -DgenerateReports=false
+            -Dstream={stream}
+            {opendaylight-infra-mvn-opts}

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:

-            - '-Xmx4096m -Dmaven.compile.fork=true'
+            - "-Xmx4096m -Dmaven.compile.fork=true"

           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings


@@ -1983,14 +1984,14 @@
           maven-version: mvn35
           pom: distribution/pom.xml
           goals: |
           maven-version: mvn35
           pom: distribution/pom.xml
           goals: |

-              clean install dependency:tree
-              -Pq
-              -Dgitid.skip=false
-              -Dmaven.gitcommitid.skip=false
-              {opendaylight-infra-mvn-opts}
+            clean install dependency:tree
+            -Pq
+            -Dgitid.skip=false
+            -Dmaven.gitcommitid.skip=false
+            {opendaylight-infra-mvn-opts}

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:

-            - '-Xmx1024m -Dmaven.compile.fork=true'
+            - "-Xmx1024m -Dmaven.compile.fork=true"

           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings


@@ -1998,7 +1999,7 @@
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - trigger-builds:
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - trigger-builds:

-          - project: '{csit-list}'
+          - project: "{csit-list}"

             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL


@@ -2009,9 +2010,8 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

 
 #####################
 # inttest-csit-apex #
 
 #####################
 # inttest-csit-apex #


@@ -2027,7 +2027,7 @@
     openstack-cloud: vex
     openstack-heat-template: csit-apex-3-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
     openstack-cloud: vex
     openstack-heat-template: csit-apex-3-instance-type.yaml
     openstack-heat-template-dir: openstack-hot

-    controller-max-mem: '2048m'
+    controller-max-mem: "2048m"

 
     #####################
     # Job configuration #
 
     #####################
     # Job configuration #


@@ -2035,119 +2035,119 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: ''
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: '{use-features-boot}'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: ""
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "{use-features-boot}"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-3-type:
       - integration-stack-3-type:

-          vm_0_count: '{apex_controller_count}'
-          vm_0_flavor: '{apex_controller_flavor}'
-          vm_0_image: '{apex_controller_image}'
-          vm_1_count: '1'
-          vm_1_flavor: '{apex_compute_0_flavor}'
-          vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: '1'
-          vm_2_flavor: '{apex_compute_1_flavor}'
-          vm_2_image: '{apex_compute_1_image}'
+          vm_0_count: "{apex_controller_count}"
+          vm_0_flavor: "{apex_controller_flavor}"
+          vm_0_image: "{apex_controller_image}"
+          vm_1_count: "1"
+          vm_1_flavor: "{apex_compute_0_flavor}"
+          vm_1_image: "{apex_compute_0_image}"
+          vm_2_count: "1"
+          vm_2_flavor: "{apex_compute_1_flavor}"
+          vm_2_image: "{apex_compute_1_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{project}-{functionality}.txt'
+          test-plan: "{project}-{functionality}.txt"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - string:
           name: OPENSTACK_BRANCH
       - string:
           name: OPENSTACK_BRANCH

-          default: '{openstack-branch}'
-          description: 'Openstack version to use with devstack'
+          default: "{openstack-branch}"
+          description: "Openstack version to use with devstack"

       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED

-          default: '{ipsec-vxlan-tunnels-enabled}'
-          description: 'Enable ipsec over vxlan support for all controllers and computes'
+          default: "{ipsec-vxlan-tunnels-enabled}"
+          description: "Enable ipsec over vxlan support for all controllers and computes"

       - string:
           name: PUBLIC_BRIDGE
       - string:
           name: PUBLIC_BRIDGE

-          default: '{public-bridge}'
-          description: 'Specifies public bridge for provider and external networking'
+          default: "{public-bridge}"
+          description: "Specifies public bridge for provider and external networking"

       - string:
           name: SECURITY_GROUP_MODE
       - string:
           name: SECURITY_GROUP_MODE

-          default: '{security-group-mode}'
-          description: 'Security Group Mode to be used in netvirt aclservice config'
+          default: "{security-group-mode}"
+          description: "Security Group Mode to be used in netvirt aclservice config"

       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS
       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS

-          default: '{enable-itm-direct-tunnels}'
-          description: 'Tunnel Configuration mode to be used in genius ifm config'
+          default: "{enable-itm-direct-tunnels}"
+          description: "Tunnel Configuration mode to be used in genius ifm config"

       - string:
           name: PUBLIC_PHYSICAL_NETWORK
       - string:
           name: PUBLIC_PHYSICAL_NETWORK

-          default: '{public-physical-network}'
-          description: 'provider physical network used for flat/vlan networks'
+          default: "{public-physical-network}"
+          description: "provider physical network used for flat/vlan networks"

       - string:
           name: ODL_SNAT_MODE
       - string:
           name: ODL_SNAT_MODE

-          default: '{odl-snat-mode}'
-          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+          default: "{odl-snat-mode}"
+          description: "The SNAT mode to be configured - options are conntrack/controller."

       - string:
           name: GROUP_ADD_MOD_ENABLED
       - string:
           name: GROUP_ADD_MOD_ENABLED

-          default: '{group-add-mod-enabled}'
-          description: 'The Group add mod enabled mode to be configured - options are true/false.'
+          default: "{group-add-mod-enabled}"
+          description: "The Group add mod enabled mode to be configured - options are true/false."

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$PATCHREFSPEC"
+          branch: "master"

 
     triggers:
 
     triggers:

-      - timed: '{schedule}'
+      - timed: "{schedule}"

 
     builders:
       - lf-infra-pre-build
       - integration-stack-3-type:
 
     builders:
       - lf-infra-pre-build
       - integration-stack-3-type:

-          openstack-cloud: '{openstack-cloud}'
-          openstack-heat-template: '{openstack-heat-template}'
-          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-cloud: "{openstack-cloud}"
+          openstack-heat-template: "{openstack-heat-template}"
+          openstack-heat-template-dir: "{openstack-heat-template-dir}"

       - integration-install-robotframework
       - integration-detect-variables
       - integration-install-common-functions
       - inject:
       - integration-install-robotframework
       - integration-detect-variables
       - integration-install-common-functions
       - inject:

-          properties-file: 'env.properties'
+          properties-file: "env.properties"

       - integration-get-apex-addresses
       - inject:
       - integration-get-apex-addresses
       - inject:

-          properties-file: 'slave_addresses.txt'
+          properties-file: "slave_addresses.txt"

       - integration-apex-run-tests
       - integration-cleanup-tmp
 
     publishers:
       - email-notification:
       - integration-apex-run-tests
       - integration-cleanup-tmp
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"

       - integration-csit-publish:
           robot_other_files:
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:
       - integration-csit-publish:
           robot_other_files:
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
       - lf-stack-delete:

-          openstack-cloud: '{openstack-cloud}'
+          openstack-cloud: "{openstack-cloud}"

       - lf-infra-publish
 
 - job-template:
     # yamllint disable-line rule:line-length
       - lf-infra-publish
 
 - job-template:
     # yamllint disable-line rule:line-length

-    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}'
+    name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}"

     id: inttest-csit-apex
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     id: inttest-csit-apex
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates


@@ -2155,7 +2155,7 @@
 
 - job-template:
     # yamllint disable-line rule:line-length
 
 - job-template:
     # yamllint disable-line rule:line-length

-    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}'
+    name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}"

     id: inttest-csit-apex-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates
     id: inttest-csit-apex-custom
     <<: *inttest_csit_common
     # yamllint disable-line rule:key-duplicates


@@ -2163,73 +2163,73 @@
 
     parameters:
       - integration-csit-parameters:
 
     parameters:
       - integration-csit-parameters:

-          archive-artifacts: '{archive-artifacts}'
-          branch: '{branch}'
-          os-cloud: '{os-cloud}'
+          archive-artifacts: "{archive-artifacts}"
+          branch: "{branch}"
+          os-cloud: "{os-cloud}"

           # CSIT
           # CSIT

-          bundle-url: '{bundle-url}'
-          repo-url: '{repo-url}'
-          robot-options: '{robot-options}'
+          bundle-url: "{bundle-url}"
+          repo-url: "{repo-url}"
+          robot-options: "{robot-options}"

           # Controller
           # Controller

-          controller-scope: ''
-          controller-max-mem: '{controller-max-mem}'
-          debug-map: '{debug-map}'
-          install-features: '{install-features}'
-          use-features-boot: '{use-features-boot}'
-          elasticsearch-attribute: '{elasticsearch-attribute}'
+          controller-scope: ""
+          controller-max-mem: "{controller-max-mem}"
+          debug-map: "{debug-map}"
+          install-features: "{install-features}"
+          use-features-boot: "{use-features-boot}"
+          elasticsearch-attribute: "{elasticsearch-attribute}"

       - integration-stack-3-type:
       - integration-stack-3-type:

-          vm_0_count: '{apex_controller_count}'
-          vm_0_flavor: '{apex_controller_flavor}'
-          vm_0_image: '{apex_controller_image}'
-          vm_1_count: '1'
-          vm_1_flavor: '{apex_compute_0_flavor}'
-          vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: '1'
-          vm_2_flavor: '{apex_compute_1_flavor}'
-          vm_2_image: '{apex_compute_1_image}'
+          vm_0_count: "{apex_controller_count}"
+          vm_0_flavor: "{apex_controller_flavor}"
+          vm_0_image: "{apex_controller_image}"
+          vm_1_count: "1"
+          vm_1_flavor: "{apex_compute_0_flavor}"
+          vm_1_image: "{apex_compute_0_image}"
+          vm_2_count: "1"
+          vm_2_flavor: "{apex_compute_1_flavor}"
+          vm_2_image: "{apex_compute_1_image}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - integration-test-plan:
       - integration-test-plan:

-          test-plan: '{testplan}'
+          test-plan: "{testplan}"

       - integration-test-suites:
       - integration-test-suites:

-          test-suites: '{test-suites}'
+          test-suites: "{test-suites}"

       - integration-patch-refspec:
       - integration-patch-refspec:

-          branch: 'master'
+          branch: "master"

       - integration-jdk-version:
       - integration-jdk-version:

-          jdkversion: '{jre}'
+          jdkversion: "{jre}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - string:
           name: OPENSTACK_BRANCH
       - string:
           name: OPENSTACK_BRANCH

-          default: '{openstack-branch}'
-          description: 'Openstack version to use with devstack'
+          default: "{openstack-branch}"
+          description: "Openstack version to use with devstack"

       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED

-          default: '{ipsec-vxlan-tunnels-enabled}'
-          description: 'Enable ipsec over vxlan support for all controllers and computes'
+          default: "{ipsec-vxlan-tunnels-enabled}"
+          description: "Enable ipsec over vxlan support for all controllers and computes"

       - string:
           name: PUBLIC_BRIDGE
       - string:
           name: PUBLIC_BRIDGE

-          default: '{public-bridge}'
-          description: 'Specifies public bridge for provider and external networking'
+          default: "{public-bridge}"
+          description: "Specifies public bridge for provider and external networking"

       - string:
           name: SECURITY_GROUP_MODE
       - string:
           name: SECURITY_GROUP_MODE

-          default: '{security-group-mode}'
-          description: 'Security Group Mode to be used in netvirt aclservice config'
+          default: "{security-group-mode}"
+          description: "Security Group Mode to be used in netvirt aclservice config"

       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS
       - string:
           name: ENABLE_ITM_DIRECT_TUNNELS

-          default: '{enable-itm-direct-tunnels}'
-          description: 'Tunnel Configuration mode to be used in genius ifm config'
+          default: "{enable-itm-direct-tunnels}"
+          description: "Tunnel Configuration mode to be used in genius ifm config"

       - string:
           name: PUBLIC_PHYSICAL_NETWORK
       - string:
           name: PUBLIC_PHYSICAL_NETWORK

-          default: '{public-physical-network}'
-          description: 'provider physical network used for flat/vlan networks'
+          default: "{public-physical-network}"
+          description: "provider physical network used for flat/vlan networks"

       - string:
           name: ODL_SNAT_MODE
       - string:
           name: ODL_SNAT_MODE

-          default: '{odl-snat-mode}'
-          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+          default: "{odl-snat-mode}"
+          description: "The SNAT mode to be configured - options are conntrack/controller."

       - string:
           name: GROUP_ADD_MOD_ENABLED
       - string:
           name: GROUP_ADD_MOD_ENABLED

-          default: '{group-add-mod-enabled}'
-          description: 'The Group add mod enabled mode to be configured - options are true/false.'
+          default: "{group-add-mod-enabled}"
+          description: "The Group add mod enabled mode to be configured - options are true/false."

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 707b0a7ee9a204d8c1ab5a38cfc0b9eea3b78a9b..e0a3cf008fc4fbb52d8e12de80459dd733c1748c 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -4,10 +4,10 @@
     project: integration/test
     project-name: integration-test
     jobs:
     project: integration/test
     project-name: integration-test
     jobs:

-      - 'integration-patch-test-{stream}'
-      - 'inttest-multipatch'
-      - 'integration-merge-dashboard'
-      - '{project-name}-rtd-jobs':
+      - "integration-patch-test-{stream}"
+      - "inttest-multipatch"
+      - "integration-merge-dashboard"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: integration/test
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationtest/32934/
           build-node: centos7-builder-2c-2g
           project-pattern: integration/test
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationtest/32934/


@@ -20,187 +20,187 @@
     # CSIT Lists in defaults.yaml
     stream:
       - silicon:
     # CSIT Lists in defaults.yaml
     stream:
       - silicon:

-          branch: 'master'
-          mvn-version: 'mvn35'
-          java-version: 'openjdk11'
+          branch: "master"
+          mvn-version: "mvn35"
+          java-version: "openjdk11"

           csit-list: !include: csit-jobs-silicon.lst
           build-order: >
           csit-list: !include: csit-jobs-silicon.lst
           build-order: >

-              odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
-              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
-              bgpcep integration/distribution
+            odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
+            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+            bgpcep integration/distribution

 
       - aluminium:
 
       - aluminium:

-          branch: 'stable/aluminium'
-          mvn-version: 'mvn35'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          mvn-version: "mvn35"
+          java-version: "openjdk11"

           csit-list: !include: csit-jobs-aluminium.lst
           build-order: >
           csit-list: !include: csit-jobs-aluminium.lst
           build-order: >

-              odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
-              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
-              bgpcep integration/distribution
+            odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
+            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+            bgpcep integration/distribution

 
       - magnesium:
 
       - magnesium:

-          branch: 'stable/magnesium'
-          mvn-version: 'mvn35'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          mvn-version: "mvn35"
+          java-version: "openjdk11"

           csit-list: !include: csit-jobs-magnesium.lst
           build-order: >
           csit-list: !include: csit-jobs-magnesium.lst
           build-order: >

-              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
-              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
-              bgpcep integration/distribution
+            odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+            bgpcep integration/distribution

 
       - sodium:
 
       - sodium:

-          branch: 'stable/sodium'
-          mvn-version: 'mvn35'
+          branch: "stable/sodium"
+          mvn-version: "mvn35"

           csit-list: !include: csit-jobs-sodium.lst
           build-order: >
           csit-list: !include: csit-jobs-sodium.lst
           build-order: >

-              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
-              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
-              bgpcep integration/distribution
+            odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+            daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+            bgpcep integration/distribution

 
 - project:
     name: integration-distribution
     project: integration/test
     project-name: integration-test
     jobs:
 
 - project:
     name: integration-distribution
     project: integration/test
     project-name: integration-test
     jobs:

-      - 'integration-distribution-test-{stream}'
-      - 'integration-distribution-mri-test-{stream}'
-      - 'integration-distribution-weekly-test-trigger-{stream}'
-      - 'integration-update-csit-tests-{stream}'
+      - "integration-distribution-test-{stream}"
+      - "integration-distribution-mri-test-{stream}"
+      - "integration-distribution-weekly-test-trigger-{stream}"
+      - "integration-update-csit-tests-{stream}"

 
     # CSIT Lists in defaults.yaml
     stream:
       - silicon:
 
     # CSIT Lists in defaults.yaml
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

           csit-blocklist: >
           csit-blocklist: >

-              alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
-              nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
-              gate longevity sanity tdd tempest wip
-              bgpcep-csit-3node-bgpclustering-all
-              bgpcep-csit-3node-bgpclustering-ha-only
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
-              netvirt-csit-3node-1cmb
-              openflowplugin-csit-1node-bundle-based-reconciliation
-              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+            alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
+            nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+            gate longevity sanity tdd tempest wip
+            bgpcep-csit-3node-bgpclustering-all
+            bgpcep-csit-3node-bgpclustering-ha-only
+            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+            netvirt-csit-3node-1cmb
+            openflowplugin-csit-1node-bundle-based-reconciliation
+            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used

           csit-list: !include: csit-jobs-silicon.lst
           csit-list: !include: csit-jobs-silicon.lst

-          csit-mri-list: '{csit-mri-list-silicon}'
-          csit-weekly-list: '{csit-weekly-list-silicon}'
+          csit-mri-list: "{csit-mri-list-silicon}"
+          csit-weekly-list: "{csit-weekly-list-silicon}"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

           csit-blocklist: >
           csit-blocklist: >

-              alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
-              nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
-              gate longevity sanity tdd tempest wip
-              bgpcep-csit-3node-bgpclustering-all
-              bgpcep-csit-3node-bgpclustering-ha-only
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
-              netvirt-csit-3node-1cmb
-              openflowplugin-csit-1node-bundle-based-reconciliation
-              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+            alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
+            nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+            gate longevity sanity tdd tempest wip
+            bgpcep-csit-3node-bgpclustering-all
+            bgpcep-csit-3node-bgpclustering-ha-only
+            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+            netvirt-csit-3node-1cmb
+            openflowplugin-csit-1node-bundle-based-reconciliation
+            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used

           csit-list: !include: csit-jobs-aluminium.lst
           csit-list: !include: csit-jobs-aluminium.lst

-          csit-mri-list: '{csit-mri-list-aluminium}'
-          csit-weekly-list: '{csit-weekly-list-aluminium}'
+          csit-mri-list: "{csit-mri-list-aluminium}"
+          csit-weekly-list: "{csit-weekly-list-aluminium}"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

           csit-blocklist: >
           csit-blocklist: >

-              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
-              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
-              gate longevity sanity tdd tempest wip
-              bgpcep-csit-3node-bgpclustering-all
-              bgpcep-csit-3node-bgpclustering-ha-only
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
-              netvirt-csit-3node-1cmb
-              openflowplugin-csit-1node-bundle-based-reconciliation
-              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+            alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+            p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+            gate longevity sanity tdd tempest wip
+            bgpcep-csit-3node-bgpclustering-all
+            bgpcep-csit-3node-bgpclustering-ha-only
+            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+            netvirt-csit-3node-1cmb
+            openflowplugin-csit-1node-bundle-based-reconciliation
+            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used

           csit-list: !include: csit-jobs-magnesium.lst
           csit-list: !include: csit-jobs-magnesium.lst

-          csit-mri-list: '{csit-mri-list-magnesium}'
-          csit-weekly-list: '{csit-weekly-list-magnesium}'
+          csit-mri-list: "{csit-mri-list-magnesium}"
+          csit-weekly-list: "{csit-weekly-list-magnesium}"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

           csit-blocklist: >
           csit-blocklist: >

-              alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
-              p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
-              gate longevity sanity tdd tempest wip
-              bgpcep-csit-3node-bgpclustering-all
-              bgpcep-csit-3node-bgpclustering-ha-only
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
-              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
-              netvirt-csit-3node-1cmb
-              openflowplugin-csit-1node-bundle-based-reconciliation
-              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+            alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
+            p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
+            gate longevity sanity tdd tempest wip
+            bgpcep-csit-3node-bgpclustering-all
+            bgpcep-csit-3node-bgpclustering-ha-only
+            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+            netvirt-csit-3node-1cmb
+            openflowplugin-csit-1node-bundle-based-reconciliation
+            last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used

           csit-list: !include: csit-jobs-sodium.lst
           csit-list: !include: csit-jobs-sodium.lst

-          csit-mri-list: '{csit-mri-list-sodium}'
-          csit-weekly-list: '{csit-weekly-list-sodium}'
+          csit-mri-list: "{csit-mri-list-sodium}"
+          csit-weekly-list: "{csit-weekly-list-sodium}"

 
 - project:
     name: integration-sanity
     project: integration/test
     project-name: integration-test
     jobs:
 
 - project:
     name: integration-sanity
     project: integration/test
     project-name: integration-test
     jobs:

-      - 'integration-sanity-test-{stream}'
+      - "integration-sanity-test-{stream}"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

           karaf-version: odl
           karaf-version: odl

-          csit-sanity-list: '{csit-sanity-list-aluminium}'
+          csit-sanity-list: "{csit-sanity-list-aluminium}"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

           karaf-version: odl
           karaf-version: odl

-          csit-sanity-list: '{csit-sanity-list-aluminium}'
+          csit-sanity-list: "{csit-sanity-list-aluminium}"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

           karaf-version: odl
           karaf-version: odl

-          csit-sanity-list: '{csit-sanity-list-magnesium}'
+          csit-sanity-list: "{csit-sanity-list-magnesium}"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

           karaf-version: odl
           karaf-version: odl

-          csit-sanity-list: '{csit-sanity-list-sodium}'
+          csit-sanity-list: "{csit-sanity-list-sodium}"

 
 - job-template:
 
 - job-template:

-    name: 'integration-merge-dashboard'
+    name: "integration-merge-dashboard"

     project-type: freestyle
     node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
     project-type: freestyle
     node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "master"
+          refspec: "refs/heads/master"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'test'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "test"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
       - gerrit-trigger-patch-merged:
 
     triggers:
       - gerrit-trigger-patch-merged:

-          gerrit-server-name: '{gerrit-server-name}'
-          name: '{project}'
-          branch: 'master'
-          files: 'dashboard/**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          name: "{project}"
+          branch: "master"
+          files: "dashboard/**"
+          forbidden-files: ""

 
     builders:
       - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: odl-elastic-cloud
 
     builders:
       - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: odl-elastic-cloud

-              target: '$HOME/.netrc'
+              target: "$HOME/.netrc"

       - integration-install-robotframework
       # yamllint disable-line rule:line-length
       - shell: python3 $WORKSPACE/test/csit/scripts/push_dashboard.py a4ff38b99ef2c7626450543021b4c134.us-east-1.aws.found.io:9243
       - integration-install-robotframework
       # yamllint disable-line rule:line-length
       - shell: python3 $WORKSPACE/test/csit/scripts/push_dashboard.py a4ff38b99ef2c7626450543021b4c134.us-east-1.aws.found.io:9243


@@ -208,11 +208,11 @@
     publishers:
       - lf-infra-publish
       - email-notification:
     publishers:
       - lf-infra-publish
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"

 
 - job-template:
 
 - job-template:

-    name: 'integration-distribution-test-{stream}'
+    name: "integration-distribution-test-{stream}"

     # Goal: Verify a distribution through all system test available
     # Operation: This template takes a distribution and passes all available system test
 
     # Goal: Verify a distribution through all system test available
     # Operation: This template takes a distribution and passes all available system test
 


@@ -221,18 +221,18 @@
 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - integration-bundle-url:
 
     parameters:
       - integration-bundle-url:

-          bundle-url: '{bundle-url}'
+          bundle-url: "{bundle-url}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     builders:
       - lf-infra-pre-build
       - trigger-builds:
 
     builders:
       - lf-infra-pre-build
       - trigger-builds:

-          - project: '{csit-list}'
+          - project: "{csit-list}"

             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL


@@ -241,17 +241,17 @@
     wrappers:
       - lf-infra-wrappers:
           build-timeout: 1440
     wrappers:
       - lf-infra-wrappers:
           build-timeout: 1440

-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"

 
     publishers:
       - opendaylight-infra-generate-csit-status-report
       - email-notification:
 
     publishers:
       - opendaylight-infra-generate-csit-status-report
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[integration]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[integration]"

       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: 'integration-sanity-test-{stream}'
+    name: "integration-sanity-test-{stream}"

     # Goal: Verify a distribution through sanity test
     # Operation: This template takes a distribution and passes sanity test
     # This jobs works for both managed & unmanaged distro.
     # Goal: Verify a distribution through sanity test
     # Operation: This template takes a distribution and passes sanity test
     # This jobs works for both managed & unmanaged distro.


@@ -261,21 +261,21 @@
 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - integration-bundle-url:
 
     parameters:
       - integration-bundle-url:

-          bundle-url: '{bundle-url}'
+          bundle-url: "{bundle-url}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     triggers:
 
     triggers:

-      - timed: '{schedule-daily}'
+      - timed: "{schedule-daily}"

 
     builders:
       - lf-infra-pre-build
       - trigger-builds:
 
     builders:
       - lf-infra-pre-build
       - trigger-builds:

-          - project: '{csit-sanity-list}'
+          - project: "{csit-sanity-list}"

             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL


@@ -283,11 +283,11 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[integration]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[integration]"

 
 - job-template:
 
 - job-template:

-    name: 'integration-patch-test-{stream}'
+    name: "integration-patch-test-{stream}"

     # Template: integration-patch-test-{stream}
     # Goal: Build a patch and run all available system test on a distribution containing the change
     # Operation: This job template builds a patch, creates a distribution containing the patch, and
     # Template: integration-patch-test-{stream}
     # Goal: Build a patch and run all available system test on a distribution containing the change
     # Operation: This job template builds a patch, creates a distribution containing the patch, and


@@ -298,48 +298,48 @@
 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '$GERRIT_PROJECT'
-          branch: '{branch}'
-          refspec: '$GERRIT_REFSPEC'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "$GERRIT_PROJECT"
+          branch: "{branch}"
+          refspec: "$GERRIT_REFSPEC"
+          artifacts: "{archive-artifacts}"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - integration-distribution-git-url:
       - integration-distribution-git-url:

-          git-url: '{git-url}'
+          git-url: "{git-url}"

       - maven-exec:
           maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
       - maven-exec:
           maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:

-          basedir: '$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          basedir: "$GERRIT_PROJECT"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

       - integration-distribution-scm:
       - integration-distribution-scm:

-          branch: '{branch}'
+          branch: "{branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '720'
+          build-timeout: "720"

 
     triggers:
       - gerrit:
 
     triggers:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - comment-added-contains-event:
           trigger-on:
             - comment-added-contains-event:

-                comment-contains-value: 'test-integration'
+                comment-contains-value: "test-integration"

           projects:
           projects:

-            - project-compare-type: 'ANT'
-              project-pattern: '**'
+            - project-compare-type: "ANT"
+              project-pattern: "**"

               branches:
               branches:

-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"

           skip-vote:
             successful: true
             failed: true
           skip-vote:
             successful: true
             failed: true


@@ -351,21 +351,21 @@
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - lf-provide-maven-settings:
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - lf-provide-maven-settings:

-          global-settings-file: 'global-settings'
-          settings-file: 'integration-settings'
+          global-settings-file: "global-settings"
+          settings-file: "integration-settings"

       - lf-update-java-alternatives:
       - lf-update-java-alternatives:

-          java-version: '{java-version}'
+          java-version: "{java-version}"

       - maven-target:
       - maven-target:

-          maven-version: 'mvn35'
-          pom: '$GERRIT_PROJECT/pom.xml'
+          maven-version: "mvn35"
+          pom: "$GERRIT_PROJECT/pom.xml"

           goals: |
           goals: |

-              clean install dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
-              -Dstream={stream}
-              {opendaylight-infra-mvn-opts}
+            clean install dependency:tree -DoutputFile=dependency_tree.txt
+            -Pq
+            -Dstream={stream}
+            {opendaylight-infra-mvn-opts}

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:

-            - '-Xmx4096m -Dmaven.compile.fork=true'
+            - "-Xmx4096m -Dmaven.compile.fork=true"

           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings


@@ -374,11 +374,11 @@
           maven-version: mvn35
           pom: distribution/pom.xml
           goals: |
           maven-version: mvn35
           pom: distribution/pom.xml
           goals: |

-              clean install dependency:tree -DoutputFile=dependency_tree.txt
-              {opendaylight-infra-mvn-opts}
+            clean install dependency:tree -DoutputFile=dependency_tree.txt
+            {opendaylight-infra-mvn-opts}

           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:

-            - '-Xmx1024m -Dmaven.compile.fork=true'
+            - "-Xmx1024m -Dmaven.compile.fork=true"

           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings


@@ -386,7 +386,7 @@
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - trigger-builds:
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - trigger-builds:

-          - project: '{csit-list}'
+          - project: "{csit-list}"

             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL


@@ -395,12 +395,11 @@
     publishers:
       - lf-infra-publish
       - email-notification:
     publishers:
       - lf-infra-publish
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[$GERRIT_PROJECT]'
-
+          email-recipients: "{email-recipients}"
+          email-prefix: "[$GERRIT_PROJECT]"

 
 - job-template:
 
 - job-template:

-    name: '{prefix}integration-multipatch-test-{stream}'
+    name: "{prefix}integration-multipatch-test-{stream}"

     # Goal: Build one or more patches and run all available system test on a distribution containing the change.
     # Operation: This job template checks out and builds in order each patch provided in job parameters, finally
     # it creates a distribution containing all patches and triggers the distribution test job which includes most
     # Goal: Build one or more patches and run all available system test on a distribution containing the change.
     # Operation: This job template checks out and builds in order each patch provided in job parameters, finally
     # it creates a distribution containing all patches and triggers the distribution test job which includes most


@@ -413,76 +412,76 @@
 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - string:
           name: PATCHES_TO_BUILD
 
     parameters:
       - string:
           name: PATCHES_TO_BUILD

-          default: '$PATCHES_TO_BUILD'
+          default: "$PATCHES_TO_BUILD"

           description: |
           description: |

-              Ordered list of patches to build in the format of project=changeset (checkout) or
-              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47.
+            Ordered list of patches to build in the format of project=changeset (checkout) or
+            project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47.

       - string:
           name: BUILD_ORDER
       - string:
           name: BUILD_ORDER

-          default: '{build-order}'
-          description: 'Build order for multipatch test when topic is used'
+          default: "{build-order}"
+          description: "Build order for multipatch test when topic is used"

       - string:
           name: BUILD_FAST
       - string:
           name: BUILD_FAST

-          default: 'true'
-          description: 'Set true to build fast -Pq'
+          default: "true"
+          description: "Set true to build fast -Pq"

       - string:
           name: BUILD_NORMAL
       - string:
           name: BUILD_NORMAL

-          default: ''
-          description: 'List of projects to build normal (no -Pq) when BUILD_FAST=true'
+          default: ""
+          description: "List of projects to build normal (no -Pq) when BUILD_FAST=true"

       - string:
           name: RUN_TEST
       - string:
           name: RUN_TEST

-          default: 'false'
-          description: 'Set true to run test after build'
+          default: "false"
+          description: "Set true to run test after build"

       - integration-distribution-branch:
       - integration-distribution-branch:

-          branch: '{branch}'
+          branch: "{branch}"

       - integration-distribution-stream:
       - integration-distribution-stream:

-          stream: '{stream}'
+          stream: "{stream}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

       - opendaylight-infra-parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: 'integration/distribution'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "integration/distribution"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: ''
-          mvn-params: ''
+          mvn-opts: ""
+          mvn-params: ""

           mvn-version: mvn35
           mvn-version: mvn35

-          staging-profile-id: ''  # Staging repos do not make sense for this job
+          staging-profile-id: "" # Staging repos do not make sense for this job

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '1200'
+          build-timeout: "1200"

 
     triggers:
       - gerrit:
 
     triggers:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - comment-added-contains-event:
           trigger-on:
             - comment-added-contains-event:

-                comment-contains-value: 'multipatch-build'
+                comment-contains-value: "multipatch-build"

           projects:
             - project-compare-type: ANT
           projects:
             - project-compare-type: ANT

-              project-pattern: '**'
+              project-pattern: "**"

               branches:
                 - branch-compare-type: ANT
               branches:
                 - branch-compare-type: ANT

-                  branch-pattern: '**/{branch}'
+                  branch-pattern: "**/{branch}"

 
     builders:
       - lf-infra-pre-build
       - wipe-org-opendaylight-repo
       - lf-maven-install:
 
     builders:
       - lf-infra-pre-build
       - wipe-org-opendaylight-repo
       - lf-maven-install:

-          mvn-version: '{mvn-version}'
+          mvn-version: "{mvn-version}"

       - lf-provide-maven-settings:
       - lf-provide-maven-settings:

-          global-settings-file: 'global-settings'
-          settings-file: 'integration-distribution-settings'
+          global-settings-file: "global-settings"
+          settings-file: "integration-distribution-settings"

       - lf-update-java-alternatives:
       - lf-update-java-alternatives:

-          java-version: '{java-version}'
+          java-version: "{java-version}"

       - integration-multipatch-builder
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml
       - integration-multipatch-builder
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml


@@ -492,8 +491,8 @@
           steps:
             - trigger-builds:
                 - project: >
           steps:
             - trigger-builds:
                 - project: >

-                      integration-distribution-test-{stream},
-                      integration-distribution-mri-test-{stream}
+                    integration-distribution-test-{stream},
+                    integration-distribution-mri-test-{stream}

                   predefined-parameters: |
                     BUNDLE_URL=$BUNDLE_URL
                     KARAF_VERSION=$KARAF_VERSION
                   predefined-parameters: |
                     BUNDLE_URL=$BUNDLE_URL
                     KARAF_VERSION=$KARAF_VERSION


@@ -501,31 +500,31 @@
     publishers:
       - lf-infra-publish
       - email-notification:
     publishers:
       - lf-infra-publish
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[int/dist]"

 
 - job-template:
 
 - job-template:

-    name: 'integration-distribution-mri-test-{stream}'
+    name: "integration-distribution-mri-test-{stream}"

 
     project-type: freestyle
     node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
 
     project-type: freestyle
     node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - integration-bundle-url:
 
     parameters:
       - integration-bundle-url:

-          bundle-url: '{bundle-url}'
+          bundle-url: "{bundle-url}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     triggers:
 
     triggers:

-      - timed: '{schedule-weekly}'
+      - timed: "{schedule-weekly}"

 
     builders:
       - trigger-builds:
 
     builders:
       - trigger-builds:

-          - project: '{csit-mri-list}'
+          - project: "{csit-mri-list}"

             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL


@@ -533,31 +532,31 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[integration]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[integration]"

 
 - job-template:
 
 - job-template:

-    name: 'integration-distribution-weekly-test-trigger-{stream}'
+    name: "integration-distribution-weekly-test-trigger-{stream}"

 
     project-type: freestyle
     node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
 
     project-type: freestyle
     node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - integration-bundle-url:
 
     parameters:
       - integration-bundle-url:

-          bundle-url: '{bundle-url}'
+          bundle-url: "{bundle-url}"

       - distribution-karaf-version:
       - distribution-karaf-version:

-          karaf-version: '{karaf-version}'
+          karaf-version: "{karaf-version}"

 
     triggers:
 
     triggers:

-      - timed: '{schedule-weekly}'
+      - timed: "{schedule-weekly}"

 
     builders:
       - trigger-builds:
 
     builders:
       - trigger-builds:

-          - project: '{csit-weekly-list}'
+          - project: "{csit-weekly-list}"

             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL


@@ -565,11 +564,11 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[integration]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[integration]"

 
 - job-template:
 
 - job-template:

-    name: 'integration-update-csit-tests-{stream}'
+    name: "integration-update-csit-tests-{stream}"

 
     # This job's purpose is to update csit
     # tests to run in integration-distribution-test-{stream}
 
     # This job's purpose is to update csit
     # tests to run in integration-distribution-test-{stream}


@@ -580,7 +579,7 @@
     # Default parameters #
     ######################
 
     # Default parameters #
     ######################
 

-    git-url: '$GIT_URL/$PROJECT'
+    git-url: "$GIT_URL/$PROJECT"

     submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
     submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10


@@ -598,30 +597,30 @@
 
     parameters:
       - lf-infra-parameters:
 
     parameters:
       - lf-infra-parameters:

-          project: releng/builder  # Hardcode as this job needs to pull releng/builder
-          stream: '{stream}'
-          branch: master  # Hardcode as releng/builder only has master
-          lftools-version: '{lftools-version}'
+          project: releng/builder # Hardcode as this job needs to pull releng/builder
+          stream: "{stream}"
+          branch: master # Hardcode as releng/builder only has master
+          lftools-version: "{lftools-version}"

       - string:
           name: CSIT_BLOCKLIST
       - string:
           name: CSIT_BLOCKLIST

-          default: '{csit-blocklist}'
+          default: "{csit-blocklist}"

           description: Space separated list of jobs strings to blocklist.
 
     scm:
       - lf-infra-gerrit-scm:
           description: Space separated list of jobs strings to blocklist.
 
     scm:
       - lf-infra-gerrit-scm:

-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-disable: '{submodule-disable}'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-disable: "{submodule-disable}"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"

           choosing-strategy: default
 
     wrappers:
       - lf-infra-wrappers:
           build-timeout: 10
           choosing-strategy: default
 
     wrappers:
       - lf-infra-wrappers:
           build-timeout: 10

-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"

 
     triggers:
       - reverse:
 
     triggers:
       - reverse:


@@ -634,12 +633,12 @@
           git status
           git add jjb/integration/*.lst
       - lf-infra-push-gerrit-patch:
           git status
           git add jjb/integration/*.lst
       - lf-infra-push-gerrit-patch:

-          project: 'releng/builder'
-          gerrit-user: 'jenkins-$SILO'
-          gerrit-host: 'git.opendaylight.org'
-          gerrit-topic: 'auto-update-csit-jobs-{stream}'
-          gerrit-commit-message: 'Auto Update CSIT Jobs to run for {stream}'
-          reviewers-email: 'jluhrsen@gmail.com'
+          project: "releng/builder"
+          gerrit-user: "jenkins-$SILO"
+          gerrit-host: "git.opendaylight.org"
+          gerrit-topic: "auto-update-csit-jobs-{stream}"
+          gerrit-commit-message: "Auto Update CSIT Jobs to run for {stream}"
+          reviewers-email: "jluhrsen@gmail.com"

 
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index 9a1b2a90ccf9d082d59a34487868df5e66f12aed..498fc21ec6380cb7a7ca7f4192d5be4a90b454cd 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -5,34 +5,34 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'jsonrpc'
+    project: "jsonrpc"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'basic'
+    functionality: "basic"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # no mininet required
     tools_system_count: 0
 
     # Features to install
 
     # no mininet required
     tools_system_count: 0
 
     # Features to install

-    install-features: 'odl-jsonrpc-all'
+    install-features: "odl-jsonrpc-all"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 8076205eeff43e383772dcc33b40c714c81f7177..603124372493913d3176e4c213207ae8a2f14a42 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,8 +2,8 @@
 - project:
     name: jsonrpc-silicon
     jobs:
 - project:
     name: jsonrpc-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/


@@ -11,15 +11,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
+    project: "jsonrpc"
+    project-name: "jsonrpc"

     stream: silicon
     stream: silicon

-    java-version: 'openjdk11'
-    branch: 'master'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    java-version: "openjdk11"
+    branch: "master"
+    mvn-settings: "jsonrpc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d


@@ -27,8 +27,8 @@
 - project:
     name: jsonrpc-aluminium
     jobs:
 - project:
     name: jsonrpc-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/


@@ -36,15 +36,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
+    project: "jsonrpc"
+    project-name: "jsonrpc"

     stream: aluminium
     stream: aluminium

-    java-version: 'openjdk11'
-    branch: 'stable/aluminium'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    java-version: "openjdk11"
+    branch: "stable/aluminium"
+    mvn-settings: "jsonrpc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d


@@ -52,8 +52,8 @@
 - project:
     name: jsonrpc-magnesium
     jobs:
 - project:
     name: jsonrpc-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/


@@ -61,15 +61,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
+    project: "jsonrpc"
+    project-name: "jsonrpc"

     stream: magnesium
     stream: magnesium

-    java-version: 'openjdk11'
-    branch: 'stable/magnesium'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    java-version: "openjdk11"
+    branch: "stable/magnesium"
+    mvn-settings: "jsonrpc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d


@@ -77,7 +77,7 @@
 - project:
     name: jsonrpc-sodium
     jobs:
 - project:
     name: jsonrpc-sodium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/


@@ -85,14 +85,14 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
+    project: "jsonrpc"
+    project-name: "jsonrpc"

     stream: sodium
     stream: sodium

-    branch: 'stable/sodium'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    branch: "stable/sodium"
+    mvn-settings: "jsonrpc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
+    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"

 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d


@@ -113,16 +113,16 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    java-version: 'openjdk11'
-    branch: 'master'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "jsonrpc"
+    project-name: "jsonrpc"
+    java-version: "openjdk11"
+    branch: "master"
+    mvn-settings: "jsonrpc-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: jsonrpc-info
 
 - project:
     name: jsonrpc-info

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 1c93e8befd15c73f043e55b182349466e15d3a46..55f97236ba648e2f4468d99aa5ccd36d8662da71 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -5,42 +5,42 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'l2switch'
+    project: "l2switch"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'host-scalability-daily'
+    functionality: "host-scalability-daily"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-l2switch-switch-ui'
+    install-features: "odl-l2switch-switch-ui"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

 
     # Plot Info
 
     # Plot Info

-    01-plot-title: 'Maximum Hosts Single Switch'
-    01-plot-yaxis: 'Hosts'
-    01-plot-group: 'Host Scalability'
-    01-plot-data-file: 'hosts.csv'
-    02-plot-title: 'Host Discover Time'
-    02-plot-yaxis: 'Seconds'
-    02-plot-group: 'Host Scalability'
-    02-plot-data-file: 'time.csv'
+    01-plot-title: "Maximum Hosts Single Switch"
+    01-plot-yaxis: "Hosts"
+    01-plot-group: "Host Scalability"
+    01-plot-data-file: "hosts.csv"
+    02-plot-title: "Host Discover Time"
+    02-plot-yaxis: "Seconds"
+    02-plot-group: "Host Scalability"
+    02-plot-data-file: "time.csv"

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 115c182a7ad6765db32d0bb691580e11f6d4c49d..a1d2e1a9bc69a5dbd71914b199b7eb3c8bb7f7b9 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -5,32 +5,32 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'l2switch'
+    project: "l2switch"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'scalability'
+    functionality: "scalability"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-l2switch-switch-ui'
+    install-features: "odl-l2switch-switch-ui"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v TOPO_TREE_DEPTH:7'
+    robot-options: "-v TOPO_TREE_DEPTH:7"

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 78101db98fbc6e6d82378e52eb1a52d913207195..4b831f8a3499e7f21d66a6dcf115a058a4ceaa24 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -6,32 +6,32 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'l2switch'
+    project: "l2switch"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'switch'
+    functionality: "switch"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-l2switch-switch-ui'
+    install-features: "odl-l2switch-switch-ui"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v TOPO_TREE_DEPTH:5'
+    robot-options: "-v TOPO_TREE_DEPTH:5"

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 6172f0defe2a5f63acbbc517c9cf2bf6d0a7687f..635bbf2b324f7aaa24711611812b30e3ff38eb70 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -5,28 +5,28 @@
       - inttest-patch-test
 
     # The project name
       - inttest-patch-test
 
     # The project name

-    project: 'l2switch'
+    project: "l2switch"

     disable-job: true
 
     # Project branches
     stream:
       - silicon:
     disable-job: true
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
+    os-branch: "queens"

 
     feature:
       - all:
           csit-list: >
 
     feature:
       - all:
           csit-list: >

-              l2switch-csit-1node--host-scalability-daily-only-{stream},
-              l2switch-csit-1node-scalability-all-{stream},
-              l2switch-csit-1node-switch-all-{stream}
+            l2switch-csit-1node--host-scalability-daily-only-{stream},
+            l2switch-csit-1node-scalability-all-{stream},
+            l2switch-csit-1node-switch-all-{stream}

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 864ac48ddcbd7197d17a4d873989eac3837a2725..8e2b5f56d90c7e9c428b7f9712b33074cb4e7286 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -6,18 +6,18 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'master'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "master"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream}
+    email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -30,18 +30,18 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/aluminium'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "stable/aluminium"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream}
+    email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -54,18 +54,18 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/magnesium'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "stable/magnesium"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream}
+    email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -78,18 +78,18 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/sodium'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "stable/sodium"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream}
+    email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -110,16 +110,16 @@
     name: l2switch-sonar
     jobs:
       - gerrit-maven-sonar
     name: l2switch-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'master'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "master"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"

     disable-job: true
     sonarcloud: true
     disable-job: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: l2switch-info
 
 - project:
     name: l2switch-info

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 24fa430d1d996a5f367a7104ede6d61654da6879..90a19d3d7d589ce2a2d5d6efb6b313ecb8a18dbb 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -9,7 +9,7 @@
     build-node: ubuntu1804-docker-4c-4g
     build-timeout: 60
     stream: any
     build-node: ubuntu1804-docker-4c-4g
     build-timeout: 60
     stream: any

-    branch: '*'
+    branch: "*"

     python-version: python3
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     python-version: python3
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT


@@ -24,7 +24,7 @@
     project: releng/ci-workshop
     build-node: centos7-builder-2c-8g
     stream: any
     project: releng/ci-workshop
     build-node: centos7-builder-2c-8g
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng


@@ -38,7 +38,7 @@
     project: releng/info-master
     build-node: centos7-builder-2c-2g
     stream: any
     project: releng/info-master
     build-node: centos7-builder-2c-2g
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng


@@ -52,14 +52,14 @@
     project: zzz-test-release
     build-node: centos7-builder-2c-2g
     stream: any
     project: zzz-test-release
     build-node: centos7-builder-2c-2g
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://git.opendaylight.org/gerrit/$GERRIT_PROJECT
 
 - project:
     name: lf-infra-common-packer
     jobs:
 
     git-url: https://git.opendaylight.org/gerrit/$GERRIT_PROJECT
 
 - project:
     name: lf-infra-common-packer
     jobs:

-      - '{project-name}-rtd-jobs'
+      - "{project-name}-rtd-jobs"

       - gerrit-release-announce
       - gerrit-tox-verify
 
       - gerrit-release-announce
       - gerrit-tox-verify
 


@@ -70,7 +70,7 @@
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-common-packer/38930/
     rtd-token: 0cdf727cc22f8f888ffec0e69f46d89031018776
     stream: any
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-common-packer/38930/
     rtd-token: 0cdf727cc22f8f888ffec0e69f46d89031018776
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng


@@ -78,7 +78,7 @@
 - project:
     name: lf-infra-docs
     jobs:
 - project:
     name: lf-infra-docs
     jobs:

-      - '{project-name}-rtd-jobs'
+      - "{project-name}-rtd-jobs"

       - gerrit-tox-verify
 
     project-name: lf-infra-docs
       - gerrit-tox-verify
 
     project-name: lf-infra-docs


@@ -88,7 +88,7 @@
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-docs/32930/
     rtd-token: e02d61c268c3cc11b65ef169ff199dbb82989647
     stream: any
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-docs/32930/
     rtd-token: e02d61c268c3cc11b65ef169ff199dbb82989647
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng


@@ -96,7 +96,7 @@
 - project:
     name: lf-infra-docs-conf
     jobs:
 - project:
     name: lf-infra-docs-conf
     jobs:

-      - '{project-name}-rtd-jobs'
+      - "{project-name}-rtd-jobs"

       - gerrit-release-announce
       - gerrit-tox-verify
 
       - gerrit-release-announce
       - gerrit-tox-verify
 


@@ -107,7 +107,7 @@
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lfdocs-conf/32931/
     rtd-token: 27a59073490f2cefab41761dc225ac8c8bfdf028
     stream: any
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lfdocs-conf/32931/
     rtd-token: 27a59073490f2cefab41761dc225ac8c8bfdf028
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng


@@ -115,7 +115,7 @@
 - project:
     name: lf-infra-global-jjb
     jobs:
 - project:
     name: lf-infra-global-jjb
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           gerrit_trigger_file_paths:
             - compare-type: REG_EXP
               pattern: '.*\.css'
           gerrit_trigger_file_paths:
             - compare-type: REG_EXP
               pattern: '.*\.css'


@@ -126,7 +126,7 @@
             - compare-type: REG_EXP
               pattern: '.*\/conf.py'
             - compare-type: REG_EXP
             - compare-type: REG_EXP
               pattern: '.*\/conf.py'
             - compare-type: REG_EXP

-              pattern: 'releasenotes/.*'
+              pattern: "releasenotes/.*"

       - gerrit-release-announce
       - gerrit-tox-verify
 
       - gerrit-release-announce
       - gerrit-tox-verify
 


@@ -137,7 +137,7 @@
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-global-jjb/32932/
     rtd-token: f19058af6f90e04dff828e3eec5e2f0990895a7b
     stream: any
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-global-jjb/32932/
     rtd-token: f19058af6f90e04dff828e3eec5e2f0990895a7b
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng


@@ -145,7 +145,7 @@
 - project:
     name: lf-infra-lftools
     jobs:
 - project:
     name: lf-infra-lftools
     jobs:

-      - '{project-name}-rtd-jobs'
+      - "{project-name}-rtd-jobs"

       - gerrit-release-announce:
           build-node: centos7-builder-2c-1g
       - gerrit-tox-verify
       - gerrit-release-announce:
           build-node: centos7-builder-2c-1g
       - gerrit-tox-verify


@@ -158,7 +158,7 @@
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-tools/32933/
     rtd-token: 47a135ceba9053c6f88394a7171ebf5602a9fc95
     stream: any
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-tools/32933/
     rtd-token: 47a135ceba9053c6f88394a7171ebf5602a9fc95
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng


@@ -172,7 +172,7 @@
     project: releng/license-checker
     build-node: centos7-builder-2c-2g
     stream: any
     project: releng/license-checker
     build-node: centos7-builder-2c-2g
     stream: any

-    branch: '*'
+    branch: "*"

 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng

diff --git a/jjb/lf-infra/zzz-test-release.yaml b/jjb/lf-infra/zzz-test-release.yaml
index 679296798a6620a3e35771b09fe5f2085de65940..f87f5fe9e6cf5a0a86b300475245b8d308d5f4cf 100644 (file)
--- a/jjb/lf-infra/zzz-test-release.yaml
+++ b/jjb/lf-infra/zzz-test-release.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
 ---
 - project:

-    name: '{project-name}-maven-stage-{stream}'
+    name: "{project-name}-maven-stage-{stream}"

     jobs:
       - gerrit-maven-stage
     project: zzz-test-release
     jobs:
       - gerrit-maven-stage
     project: zzz-test-release


@@ -9,12 +9,12 @@
     branch: master
     distribution_branch: master
     mvn-settings: autorelease-settings
     branch: master
     distribution_branch: master
     mvn-settings: autorelease-settings

-    mvn-opts: '-Xmx1024m'
+    mvn-opts: "-Xmx1024m"

     mvn-version: mvn35
     mvn-version: mvn35

-    dependencies: ''
-    email-upstream: '[odlparent]'
+    dependencies: ""
+    email-upstream: "[odlparent]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.pom
-        **/*.xml
+      **/*.pom
+      **/*.xml

     # Used by the release job
     staging-profile-id: 615fb2f4e0adf
     # Used by the release job
     staging-profile-id: 615fb2f4e0adf

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 98f5676837a709c7d289e8c3d331013238473a94..b706b2f5dad632cbf6288a86e4d07b2c3135204a 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -7,31 +7,31 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'lispflowmapping'
+    project: "lispflowmapping"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'msmr'
+    functionality: "msmr"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-lispflowmapping-msmr'
+    install-features: "odl-lispflowmapping-msmr"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index dfb3aca6b66477c742b05e6d701f042ff2ffb31f..ec9c685bab9bcaa41ba2a3a5ab9e44cb5cc10372 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -2,9 +2,9 @@
 - project:
     name: lispflowmapping-silicon
     jobs:
 - project:
     name: lispflowmapping-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           build-node: centos7-builder-2c-2g
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/


@@ -13,18 +13,18 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy -DrepoBuild'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    project: "lispflowmapping"
+    project-name: "lispflowmapping"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "lispflowmapping-settings"
+    mvn-goals: "clean deploy -DrepoBuild"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
+    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.log
-        **/target/surefire-reports/*-output.txt
+      **/*.log
+      **/target/surefire-reports/*-output.txt

 
     build-node: centos7-builder-8c-8g
 
 
     build-node: centos7-builder-8c-8g
 


@@ -34,9 +34,9 @@
 - project:
     name: lispflowmapping-aluminium
     jobs:
 - project:
     name: lispflowmapping-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           build-node: centos7-builder-2c-2g
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/


@@ -45,18 +45,18 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy -DrepoBuild'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    project: "lispflowmapping"
+    project-name: "lispflowmapping"
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "lispflowmapping-settings"
+    mvn-goals: "clean deploy -DrepoBuild"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
+    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.log
-        **/target/surefire-reports/*-output.txt
+      **/*.log
+      **/target/surefire-reports/*-output.txt

 
     build-node: centos7-builder-8c-8g
 
 
     build-node: centos7-builder-8c-8g
 


@@ -66,9 +66,9 @@
 - project:
     name: lispflowmapping-magnesium
     jobs:
 - project:
     name: lispflowmapping-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           build-node: centos7-builder-2c-2g
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/


@@ -77,18 +77,18 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy -DrepoBuild'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    project: "lispflowmapping"
+    project-name: "lispflowmapping"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "lispflowmapping-settings"
+    mvn-goals: "clean deploy -DrepoBuild"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
+    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.log
-        **/target/surefire-reports/*-output.txt
+      **/*.log
+      **/target/surefire-reports/*-output.txt

 
     build-node: centos7-builder-8c-8g
 
 
     build-node: centos7-builder-8c-8g
 


@@ -98,9 +98,9 @@
 - project:
     name: lispflowmapping-sodium
     jobs:
 - project:
     name: lispflowmapping-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           build-node: centos7-builder-2c-2g
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/


@@ -111,17 +111,17 @@
             - openjdk8
 
     stream: sodium
             - openjdk8
 
     stream: sodium

-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/sodium'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    project: "lispflowmapping"
+    project-name: "lispflowmapping"
+    branch: "stable/sodium"
+    mvn-settings: "lispflowmapping-settings"
+    mvn-goals: "clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
+    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
+    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.log
-        **/target/surefire-reports/*-output.txt
+      **/*.log
+      **/target/surefire-reports/*-output.txt

 
     build-node: centos7-builder-8c-8g
 
 
     build-node: centos7-builder-8c-8g
 


@@ -132,17 +132,17 @@
     name: lispflowmapping-sonar
     jobs:
       - gerrit-maven-sonar
     name: lispflowmapping-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy -DrepoBuild'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    project: "lispflowmapping"
+    project-name: "lispflowmapping"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "lispflowmapping-settings"
+    mvn-goals: "clean deploy -DrepoBuild"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: lispflowmapping-info
 
 - project:
     name: lispflowmapping-info

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 26df6112f74d4817c1cca7897cfa8eeecd908d6d..87ab3d30bde5b18bd1342c44246cdfce0fb649ef 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -5,28 +5,28 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'mdsal'
+    project: "mdsal"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'bindingv1'
+    functionality: "bindingv1"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0


@@ -35,10 +35,10 @@
     odl_system_flavor: odl-standard-4
 
     # Features to install
     odl_system_flavor: odl-standard-4
 
     # Features to install

-    install-features: 'odl-restconf'
+    install-features: "odl-restconf"

 
     # Robot custom options:
 
     # Robot custom options:

-    robot-options: ''
+    robot-options: ""

 
     # Additional patterns to archive
 
     # Additional patterns to archive

-    archive-artifacts: '*.xml'
+    archive-artifacts: "*.xml"

diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
index 02ad831068e92d1d3ac5406a77d01100023619b9..4cd6c3656dfbb6f1eb71f0eda3ef2015dc9db748 100644 (file)
--- a/jjb/mdsal/mdsal-patch-test.yaml
+++ b/jjb/mdsal/mdsal-patch-test.yaml
@@ -4,34 +4,34 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'mdsal'
+    project: "mdsal"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
+    os-branch: "queens"

 
 

-    jdk: 'openjdk8'
+    jdk: "openjdk8"

 
     feature:
       - netvirt:
           csit-list: >
 
     feature:
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 08e384877f4234a6516459dd34938f7e7248ab38..18fe76b5ac6338766953a87d05c1ae4eb561ffab 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-master
     jobs:
 - project:
     name: mdsal-master
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/


@@ -15,18 +15,18 @@
     branch: master
     stream: master
 
     branch: master
     stream: master
 

-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"

     mvn-version: mvn36
     build-timeout: 90
 
     archive-artifacts: >
     mvn-version: mvn36
     build-timeout: 90
 
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
     # Used by the release job
     staging-profile-id: a674173c7b29d


@@ -34,7 +34,7 @@
 - project:
     name: mdsal-6.0.x
     jobs:
 - project:
     name: mdsal-6.0.x
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/


@@ -47,18 +47,18 @@
     branch: 6.0.x
     stream: 6.0.x
 
     branch: 6.0.x
     stream: 6.0.x
 

-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"

     mvn-version: mvn36
     build-timeout: 90
 
     archive-artifacts: >
     mvn-version: mvn36
     build-timeout: 90
 
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
     # Used by the release job
     staging-profile-id: a674173c7b29d


@@ -66,7 +66,7 @@
 - project:
     name: mdsal-5.0.x
     jobs:
 - project:
     name: mdsal-5.0.x
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/


@@ -79,20 +79,20 @@
     branch: 5.0.x
     stream: 5.0.x
 
     branch: 5.0.x
     stream: 5.0.x
 

-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"
+    mvn-opts: "-Xmx2048m"

     build-timeout: 90
 
     build-timeout: 90
 

-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[mdsal] [odlparent] [yangtools]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
     # Used by the release job
     staging-profile-id: a674173c7b29d


@@ -100,7 +100,7 @@
 - project:
     name: mdsal-v4.0.x
     jobs:
 - project:
     name: mdsal-v4.0.x
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/


@@ -113,19 +113,19 @@
     branch: v4.0.x
     stream: v4.0.x
 
     branch: v4.0.x
     stream: v4.0.x
 

-    mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    mvn-settings: "mdsal-settings"
+    mvn-opts: "-Xmx2048m"

     build-timeout: 90
 
     build-timeout: 90
 

-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[mdsal] [odlparent] [yangtools]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
     # Used by the release job
     staging-profile-id: a674173c7b29d


@@ -150,17 +150,17 @@
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
 
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
 

-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m'
+    project: "mdsal"
+    project-name: "mdsal"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"
+    mvn-goals: "-Dmaven.compile.fork=true clean deploy -Dintegrationtests"
+    mvn-opts: "-Xmx2048m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: mdsal-info
 
 - project:
     name: mdsal-info

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 382b9d427c98308d289a78081454cf0128eec831..c8d25153946d0aa7fcd77504e60d3704fce2fb29 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -6,32 +6,32 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'nemo'
+    project: "nemo"

     disable-job: true
 
     # The functionality under test
     disable-job: true
 
     # The functionality under test

-    functionality: 'engine'
+    functionality: "engine"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-nemo-engine-ui,odl-nemo-openflow-renderer'
+    install-features: "odl-restconf,odl-mdsal-apidocs,odl-nemo-engine-ui,odl-nemo-openflow-renderer"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 5ae1ff95cf59d16bc97591905d6b4cd35d0e7048..62f863c281a180787a76d3a30acafc822ec75843 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -6,13 +6,13 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'master'
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[nemo]'
+    project: "nemo"
+    project-name: "nemo"
+    branch: "master"
+    mvn-settings: "nemo-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[nemo]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -25,13 +25,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/aluminium'
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[nemo]'
+    project: "nemo"
+    project-name: "nemo"
+    branch: "stable/aluminium"
+    mvn-settings: "nemo-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[nemo]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -44,13 +44,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/magnesium'
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[nemo]'
+    project: "nemo"
+    project-name: "nemo"
+    branch: "stable/magnesium"
+    mvn-settings: "nemo-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[nemo]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -63,13 +63,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/sodium'
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[nemo]'
+    project: "nemo"
+    project-name: "nemo"
+    branch: "stable/sodium"
+    mvn-settings: "nemo-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[nemo]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -90,16 +90,16 @@
     name: nemo-sonar
     jobs:
       - gerrit-maven-sonar
     name: nemo-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'master'
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "nemo"
+    project-name: "nemo"
+    branch: "master"
+    mvn-settings: "nemo-settings"
+    mvn-opts: "-Xmx1024m"

     disable-job: true
     sonarcloud: true
     disable-job: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: nemo-info
 
 - project:
     name: nemo-info

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 66126e65ecce5768d0c1e549d901763db5bf4285..d47eb711aa5782f28a91ffb7ee87faf54185591e 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -5,33 +5,33 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'netconf'
+    project: "netconf"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'clustering-scale'
+    functionality: "clustering-scale"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-netconf-clustered-topology
+      odl-restconf,
+      odl-netconf-clustered-topology

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index a4c2f7e809acff53de13968631f5e3ed37d20d66..3e9a2e9d809dd6c2ca26430e12cffafc4dd12ccf 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -5,33 +5,33 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'netconf'
+    project: "netconf"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'clustering'
+    functionality: "clustering"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-netconf-clustered-topology
+      odl-restconf,
+      odl-netconf-clustered-topology

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index e7d4b898e231b567538d4247438470ed93783146..e47939b2d4ff6f67e8e12cb1c3a7388df3192d7a 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'netconf'
+    project: "netconf"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,26 +15,26 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # no mininet required
     tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 
     # Features to install
 
     # no mininet required
     tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 
     # Features to install

-    install-features: 'odl-netconf-callhome-ssh,odl-restconf'
+    install-features: "odl-netconf-callhome-ssh,odl-restconf"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index b015ade27df87cccdcb2cc1be1a719326bc6b476..6cb0c6e137dbb2e127acc07ca22e477f71740d97 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -4,38 +4,38 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'netconf'
+    project: "netconf"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
+    os-branch: "queens"

 
     feature:
       - core:
           csit-list: >
 
     feature:
       - core:
           csit-list: >

-                netconf-csit-1node-gate-userfeatures-all-{stream},
-                netconf-csit-1node-gate-userfeatures-rfc8040-all-{stream},
-                netconf-csit-1node-gate-callhome-only-{stream}
+            netconf-csit-1node-gate-userfeatures-all-{stream},
+            netconf-csit-1node-gate-userfeatures-rfc8040-all-{stream},
+            netconf-csit-1node-gate-callhome-only-{stream}

 
       - netvirt:
           csit-list: >
 
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index da64790362e68d6fb76c10ca78f24377280e454a..d4cc0a468beb153ede5ab2b82814d121acb11f9e 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -5,38 +5,38 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'netconf'
+    project: "netconf"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'scale'
+    functionality: "scale"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-clustering-test-app,
-        odl-netconf-mdsal,
-        odl-netconf-topology
+      odl-restconf,
+      odl-clustering-test-app,
+      odl-netconf-mdsal,
+      odl-netconf-topology

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"

 
     # ODL system configuration
     odl_system_flavor: odl-standard-4
 
     # ODL system configuration
     odl_system_flavor: odl-standard-4


@@ -47,50 +47,53 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'netconf'
+    project: "netconf"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'scale-max-devices'
+    functionality: "scale-max-devices"

 
     # Project branches
     stream:
       - aluminium:
 
     # Project branches
     stream:
       - aluminium:

-          branch: 'master'
-          jre: 'openjdk11'
-          robot-options: '-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
-                          -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
-                          -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*'
+          branch: "master"
+          jre: "openjdk11"
+          robot-options:
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
+            -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
+            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-          robot-options: '-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
-                          -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
-                          -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*'
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+          robot-options:
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
+            -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
+            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
-          robot-options: '-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:10
-                          -v MAX_DEVICE_COUNT:500 -v DEVICE_INCREMENT:25 -v TESTTOOL_BOOT_TIMEOUT:600s
-                          -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*'
+          branch: "stable/sodium"
+          robot-options:
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:10
+            -v MAX_DEVICE_COUNT:500 -v DEVICE_INCREMENT:25 -v TESTTOOL_BOOT_TIMEOUT:600s
+            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-clustering-test-app,
-        odl-netconf-mdsal,
-        odl-netconf-topology,
-        odl-jolokia
+      odl-restconf,
+      odl-clustering-test-app,
+      odl-netconf-mdsal,
+      odl-netconf-topology,
+      odl-jolokia

 
     # ODL system configuration
     odl_system_flavor: odl-standard-8
 
     # ODL system configuration
     odl_system_flavor: odl-standard-8

-    controller-max-mem: '12G'
+    controller-max-mem: "12G"

     tools_system_flavor: odl-standard-8
 
     # Plot Info
     tools_system_flavor: odl-standard-8
 
     # Plot Info

-    01-plot-title: 'Max Devices'
-    01-plot-yaxis: 'Devices'
-    01-plot-group: 'Netconf Devices'
-    01-plot-data-file: 'devices.csv'
+    01-plot-title: "Max Devices"
+    01-plot-yaxis: "Devices"
+    01-plot-group: "Netconf Devices"
+    01-plot-data-file: "devices.csv"

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index ffbef7f1fa870a41c4c9408d03a40346f2356ccf..44e0b0f6657d2dbcb772db16937bb0126bab12d8 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -5,45 +5,45 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'netconf'
+    project: "netconf"

 
     # The functionality under test
     functionality:
       - userfeatures
       - userfeatures-rfc8040:
 
     # The functionality under test
     functionality:
       - userfeatures
       - userfeatures-rfc8040:

-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True'
+          robot-options: "-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True"

       - gate-userfeatures
       - gate-userfeatures-rfc8040:
       - gate-userfeatures
       - gate-userfeatures-rfc8040:

-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True'
+          robot-options: "-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 
     # Features to install
     install-features: >
 
     tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-netconf-mdsal,
-        odl-mdsal-apidocs,
-        odl-mdsal-model-inventory,
-        odl-clustering-test-app,
-        odl-netconf-topology
+      odl-restconf,
+      odl-netconf-mdsal,
+      odl-mdsal-apidocs,
+      odl-mdsal-model-inventory,
+      odl-clustering-test-app,
+      odl-netconf-topology

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False"

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index c456cb6640dfe4a96e3716aa3f24aed1071fdb5c..eac56d0ea5c25bc8a7363d0b67a9e942746db343 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -2,8 +2,8 @@
 - project:
     name: netconf-silicon
     jobs:
 - project:
     name: netconf-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/


@@ -12,17 +12,17 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'master'
+    project: "netconf"
+    project-name: "netconf"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 90
     build-timeout: 90

-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f


@@ -30,8 +30,8 @@
 - project:
     name: netconf-aluminium
     jobs:
 - project:
     name: netconf-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/


@@ -40,17 +40,17 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/aluminium'
+    project: "netconf"
+    project-name: "netconf"
+    branch: "stable/aluminium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 90
     build-timeout: 90

-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f


@@ -58,8 +58,8 @@
 - project:
     name: netconf-magnesium
     jobs:
 - project:
     name: netconf-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/


@@ -68,17 +68,17 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/magnesium'
+    project: "netconf"
+    project-name: "netconf"
+    branch: "stable/magnesium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 90
     build-timeout: 90

-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f


@@ -86,8 +86,8 @@
 - project:
     name: netconf-sodium
     jobs:
 - project:
     name: netconf-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           build-node: centos7-builder-2c-2g
           project-pattern: netconf
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/


@@ -96,16 +96,16 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/sodium'
+    project: "netconf"
+    project-name: "netconf"
+    branch: "stable/sodium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 90
     build-timeout: 90

-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f


@@ -118,19 +118,19 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'master'
+    project: "netconf"
+    project-name: "netconf"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "netconf-settings"
+    mvn-goals: "clean deploy -Pintegrationtests"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 90
     sonarcloud: true
     build-timeout: 90
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: netconf-info
 
 - project:
     name: netconf-info

diff --git a/jjb/netvirt/netvirt-apex-images.yaml b/jjb/netvirt/netvirt-apex-images.yaml
index 4b9ebd50e416f43030eb48bd75b5641458873873..df29b91f9baaa0144d122dae7434c652d8b109d8 100644 (file)
--- a/jjb/netvirt/netvirt-apex-images.yaml
+++ b/jjb/netvirt/netvirt-apex-images.yaml
@@ -2,39 +2,39 @@
 - project:
     name: netvirt-apex-image-management
     jobs:
 - project:
     name: netvirt-apex-image-management
     jobs:

-      - 'netvirt-apex-image-management'
+      - "netvirt-apex-image-management"

 
 

-    project: 'netvirt'
+    project: "netvirt"

     os-cloud: vex
     disable-job: true
 
 - job-template:
     os-cloud: vex
     disable-job: true
 
 - job-template:

-    name: 'netvirt-apex-image-management'
+    name: "netvirt-apex-image-management"

     disable-job: false
 
     disable-job: false
 

-    node: 'centos7-apex-2c-2g'
-    disabled: '{disable-job}'
+    node: "centos7-apex-2c-2g"
+    disabled: "{disable-job}"

 
     parameters:
       - string:
           name: OS_CLOUD
 
     parameters:
       - string:
           name: OS_CLOUD

-          default: '{os-cloud}'
+          default: "{os-cloud}"

           description: |
           description: |

-              The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
-              variable name that is significant to openstack client as a
-              environment variable. Please refer to the documentation for
-              further details.
-              https://docs.openstack.org/developer/python-openstackclient/
+            The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
+            variable name that is significant to openstack client as a
+            environment variable. Please refer to the documentation for
+            further details.
+            https://docs.openstack.org/developer/python-openstackclient/

 
     wrappers:
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
             - file-id: clouds-yaml
 
     wrappers:
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
             - file-id: clouds-yaml

-              target: '$HOME/.config/openstack/clouds.yaml'
+              target: "$HOME/.config/openstack/clouds.yaml"

 
     builders:
       - integration-apex-image-manager
 
     triggers:
 
     builders:
       - integration-apex-image-manager
 
     triggers:

-      - timed: '@weekly'
+      - timed: "@weekly"

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 84f80723fa90773e40b18d6ff228759cb4a9033f..dbd8726c3f18dd3afe2078e1a62631cd3d7e33e4 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -4,15 +4,15 @@
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 

-    project: 'netvirt'
-    stream: 'aluminium'
-    branch: 'master'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "aluminium"
+    branch: "master"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -23,47 +23,47 @@
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled

-    enable-networking-l2gw: 'yes'
+    enable-networking-l2gw: "yes"

 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-daily}'
+          schedule: "{schedule-daily}"

       - gate-stateful
 
     openstack:
       - rocky:
       - gate-stateful
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"

 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 

-    project: 'netvirt'
-    stream: 'aluminium'
-    branch: 'master'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "aluminium"
+    branch: "master"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -74,48 +74,47 @@
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled

-    enable-networking-l2gw: 'yes'
+    enable-networking-l2gw: "yes"

 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-daily}'
+          schedule: "{schedule-daily}"

       - gate-stateful
 
     openstack:
       - stein:
       - gate-stateful
 
     openstack:
       - stein:

-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
-
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"

 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-magnesium-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-magnesium-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 

-    project: 'netvirt'
-    stream: 'magnesium'
-    branch: 'stable/magnesium'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "magnesium"
+    branch: "stable/magnesium"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -126,48 +125,48 @@
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled

-    enable-networking-l2gw: 'yes'
+    enable-networking-l2gw: "yes"

 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - gate-stateful
 
     openstack:
       - rocky:
       - gate-stateful
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
-          schedule: '{schedule-daily}'
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"
+          schedule: "{schedule-daily}"

 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-magnesium-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-magnesium-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 

-    project: 'netvirt'
-    stream: 'magnesium'
-    branch: 'stable/magnesium'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "magnesium"
+    branch: "stable/magnesium"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -178,48 +177,47 @@
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled

-    enable-networking-l2gw: 'yes'
+    enable-networking-l2gw: "yes"

 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - gate-stateful
 
     openstack:
       - stein:
       - gate-stateful
 
     openstack:
       - stein:

-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
-          schedule: '{schedule-weekly}'
-
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"
+          schedule: "{schedule-weekly}"

 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-sodium-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-sodium-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 

-    project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "sodium"
+    branch: "stable/sodium"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -230,31 +228,30 @@
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled

-    enable-networking-l2gw: 'yes'
+    enable-networking-l2gw: "yes"

 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - gate-stateful
 
     openstack:
       - rocky:
       - gate-stateful
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
-          schedule: '{schedule-weekly}'
-
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"
+          schedule: "{schedule-weekly}"

diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
index 3069a4da09f4d956e76324a2dd798bb583fbc0b7..834a98bdb922fc67edcdf40787615a1e2bb1f2dc 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -6,42 +6,42 @@
 
     disable-job: true
 
 
     disable-job: true
 

-    project: 'netvirt'
+    project: "netvirt"

     stream:
       - silicon:
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    testplan: '{project}-{topology}-openstack.txt'
+    testplan: "{project}-{topology}-openstack.txt"

 
 

-    test-suites: 'openstack/connectivity/l2.robot
-                  openstack/connectivity/external_network.robot'
+    test-suites: "openstack/connectivity/l2.robot
+      openstack/connectivity/external_network.robot"

 
 

-    topology: '1node'
+    topology: "1node"

 
 

-    install-features: 'odl-netvirt-openstack, odl-mdsal-trace'
+    install-features: "odl-netvirt-openstack, odl-mdsal-trace"

 
 

-    public-bridge: 'br-datacentre'
-    public-physical-network: 'datacentre'
-    odl-snat-mode: 'conntrack'
+    public-bridge: "br-datacentre"
+    public-physical-network: "datacentre"
+    odl-snat-mode: "conntrack"

 
 

-    apex_controller_count: '1'
-    apex_controller_flavor: 'v1-standard-8'
-    apex_controller_image: 'ZZCI - OPNFV - apex - controller - 0'
+    apex_controller_count: "1"
+    apex_controller_flavor: "v1-standard-8"
+    apex_controller_image: "ZZCI - OPNFV - apex - controller - 0"

 
 

-    apex_compute_0_flavor: 'v1-standard-4'
-    apex_compute_0_image: 'ZZCI - OPNFV - apex - compute - 0'
+    apex_compute_0_flavor: "v1-standard-4"
+    apex_compute_0_image: "ZZCI - OPNFV - apex - compute - 0"

 
 

-    apex_compute_1_flavor: 'v1-standard-4'
-    apex_compute_1_image: 'ZZCI - OPNFV - apex - compute - 1'
+    apex_compute_1_flavor: "v1-standard-4"
+    apex_compute_1_image: "ZZCI - OPNFV - apex - compute - 1"

 
     os-cmb-cnt: 0
     os-ctl-cnt: 1
 
     os-cmb-cnt: 0
     os-ctl-cnt: 1


@@ -50,8 +50,8 @@
     functionality:
       - upstream-snat-conntrack
       - gate-snat-conntrack:
     functionality:
       - upstream-snat-conntrack
       - gate-snat-conntrack:

-          gate-job: 'True'
+          gate-job: "True"

 
     openstack:
       - queens:
 
     openstack:
       - queens:

-          openstack-branch: 'stable/queens'
+          openstack-branch: "stable/queens"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 524c4d5443ba88f2382c87ea38087372cb31fb7d..35c3f93e66ac309ca5bec17b795bcadec269d70b 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -4,21 +4,21 @@
     jobs:
       - inttest-csit-openstack-custom
 
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
+    project: "netvirt"

 
     stream:
       - magnesium:
 
     stream:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
-
-    testplan: '{project}-{topology}-openstack-upgrade.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    group-add-mod-enabled: 'true'
+          branch: "stable/sodium"
+
+    testplan: "{project}-{topology}-openstack-upgrade.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    group-add-mod-enabled: "true"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -30,43 +30,42 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

 
     functionality:
       - upgrade:
 
     functionality:
       - upgrade:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - upgrade-snat-conntrack:
       - upgrade-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"

 
     openstack:
       - rocky:
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
-
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"

 
 - project:
     name: netvirt-csit-upgrade-openstack-integration-rocky-aluminium
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-upgrade-openstack-integration-rocky-aluminium
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
+    project: "netvirt"

 
     stream:
       - aluminium:
 
     stream:
       - aluminium:

-          branch: 'master'
-          jre: 'openjdk11'
-
-    testplan: '{project}-{topology}-openstack-upgrade.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    group-add-mod-enabled: 'true'
+          branch: "master"
+          jre: "openjdk11"
+
+    testplan: "{project}-{topology}-openstack-upgrade.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    group-add-mod-enabled: "true"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -78,42 +77,42 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

 
     functionality:
       - upgrade:
 
     functionality:
       - upgrade:

-          schedule: '{schedule-daily}'
+          schedule: "{schedule-daily}"

       - upgrade-snat-conntrack:
       - upgrade-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

 
     openstack:
       - rocky:
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"

 
 - project:
     name: netvirt-csit-upgrade-openstack-integration-stein
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-upgrade-openstack-integration-stein
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
+    project: "netvirt"

 
     stream:
       - magnesium:
 
     stream:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-
-    testplan: '{project}-{topology}-openstack-upgrade.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    group-add-mod-enabled: 'true'
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+
+    testplan: "{project}-{topology}-openstack-upgrade.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    group-add-mod-enabled: "true"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -125,42 +124,42 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

 
     functionality:
       - upgrade:
 
     functionality:
       - upgrade:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - upgrade-snat-conntrack:
       - upgrade-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"

 
     openstack:
       - stein:
 
     openstack:
       - stein:

-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"

 
 - project:
     name: netvirt-csit-upgrade-openstack-integration-stein-aluminium
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-upgrade-openstack-integration-stein-aluminium
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
+    project: "netvirt"

 
     stream:
       - aluminium:
 
     stream:
       - aluminium:

-          branch: 'master'
-          jre: 'openjdk11'
-
-    testplan: '{project}-{topology}-openstack-upgrade.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    group-add-mod-enabled: 'true'
+          branch: "master"
+          jre: "openjdk11"
+
+    testplan: "{project}-{topology}-openstack-upgrade.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    group-add-mod-enabled: "true"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -172,20 +171,20 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"

 
     functionality:
       - upgrade:
 
     functionality:
       - upgrade:

-          schedule: '{schedule-daily}'
+          schedule: "{schedule-daily}"

       - upgrade-snat-conntrack:
       - upgrade-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

 
     openstack:
       - stein:
 
     openstack:
       - stein:

-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 1803640852848a3d1759c6ec669a027a923e3b47..5ee6901e9f1f315957ce3a0621238d47698138e6 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -4,15 +4,15 @@
     jobs:
       - inttest-csit-openstack-custom
 
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    stream: 'aluminium'
-    branch: 'master'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "aluminium"
+    branch: "master"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,tempest"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -25,77 +25,77 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:
 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       - dcgw:
       - dcgw:

-          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: "{schedule-weekly}"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - rocky:
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"

 
 - project:
     name: netvirt-csit-openstack-integration-aluminium-stein
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-openstack-integration-aluminium-stein
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    stream: 'aluminium'
-    branch: 'master'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "aluminium"
+    branch: "master"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,tempest"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -108,78 +108,77 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:
 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       - dcgw:
       - dcgw:

-          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: "{schedule-weekly}"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - stein:
 
     openstack:
       - stein:

-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
-
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"

 
 - project:
     name: netvirt-csit-openstack-integration-magnesium-rocky
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-openstack-integration-magnesium-rocky
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    stream: 'magnesium'
-    branch: 'stable/magnesium'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "magnesium"
+    branch: "stable/magnesium"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,tempest"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -192,77 +191,77 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:
 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       - dcgw:
       - dcgw:

-          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: "{schedule-weekly}"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - rocky:
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"

 
 - project:
     name: netvirt-csit-openstack-integration-magnesium-stein
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-openstack-integration-magnesium-stein
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    stream: 'magnesium'
-    branch: 'stable/magnesium'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "magnesium"
+    branch: "stable/magnesium"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,tempest"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -275,80 +274,80 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - upstream-stateful-itm-direct-tunnels:
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-weekly}'
+          enable-itm-direct-tunnels: "true"
+          schedule: "{schedule-weekly}"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       - dcgw:
       - dcgw:

-          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"

           tools_system_count: 3
           tools_system_count: 3

-          schedule: '{schedule-weekly}'
-          enable-gre-type-driver: 'yes'
+          schedule: "{schedule-weekly}"
+          enable-gre-type-driver: "yes"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: "{schedule-weekly}"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - stein:
 
     openstack:
       - stein:

-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"

 
 - project:
     name: netvirt-csit-openstack-integration-sodium-queens
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-openstack-integration-sodium-queens
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "sodium"
+    branch: "stable/sodium"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,tempest"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -361,82 +360,82 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - upstream-stateful-itm-direct-tunnels:
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-weekly}'
+          enable-itm-direct-tunnels: "true"
+          schedule: "{schedule-weekly}"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-weekly}'
+          enable-itm-direct-tunnels: "true"
+          schedule: "{schedule-weekly}"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       - dcgw:
       - dcgw:

-          testplan: '{project}-{topology}-dcgw-openstack.txt'
-          schedule: '{schedule-weekly}'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"
+          schedule: "{schedule-weekly}"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: "{schedule-weekly}"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - queens:
 
     openstack:
       - queens:

-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-          schedule: '{schedule-weekly}'
+          openstack-branch: "stable/queens"
+          odl-ml2-branch: "stable/queens"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_queens_system_image}"
+          openstack_system2_image: "{openstack_queens_system_image}"
+          schedule: "{schedule-weekly}"

 
 - project:
     name: netvirt-csit-openstack-integration-sodium-rocky
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-openstack-integration-sodium-rocky
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    stream: "sodium"
+    branch: "stable/sodium"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,tempest"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4


@@ -449,77 +448,77 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - upstream-stateful-itm-direct-tunnels:
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-weekly}'
+          enable-itm-direct-tunnels: "true"
+          schedule: "{schedule-weekly}"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       - dcgw:
       - dcgw:

-          testplan: '{project}-{topology}-dcgw-openstack.txt'
-          schedule: '{schedule-weekly}'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"
+          schedule: "{schedule-weekly}"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: "{schedule-weekly}"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - rocky:
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"

 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-queens
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-queens
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'n-cpu,placement-api,tempest'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "n-cpu,placement-api,tempest"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1


@@ -528,77 +527,77 @@
 
     stream:
       - sodium:
 
     stream:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     topology:
       - 1node:
           openstack_system2_count: 0
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 0
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 1
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 1
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - upstream-stateful-itm-direct-tunnels:
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-weekly}'
+          enable-itm-direct-tunnels: "true"
+          schedule: "{schedule-weekly}"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: ''
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: ""

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - queens:
 
     openstack:
       - queens:

-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-          schedule: '{schedule-weekly}'
+          openstack-branch: "stable/queens"
+          odl-ml2-branch: "stable/queens"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_queens_system_image}"
+          openstack_system2_image: "{openstack_queens_system_image}"
+          schedule: "{schedule-weekly}"

 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'n-cpu,placement-api,tempest'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "n-cpu,placement-api,tempest"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1


@@ -607,79 +606,79 @@
 
     stream:
       - magnesium:
 
     stream:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     topology:
       - 1node:
           openstack_system2_count: 0
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 0
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 1
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 1
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - upstream-stateful-itm-direct-tunnels:
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-weekly}'
+          enable-itm-direct-tunnels: "true"
+          schedule: "{schedule-weekly}"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: ''
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: ""

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - rocky:
 
     openstack:
       - rocky:

-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"

 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'n-cpu,placement-api,tempest'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "n-cpu,placement-api,tempest"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1


@@ -688,78 +687,77 @@
 
     stream:
       - magnesium:
 
     stream:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

 
     topology:
       - 1node:
           openstack_system2_count: 0
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 0
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 1
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 1
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-weekly}'
+          schedule: "{schedule-weekly}"

       - upstream-stateful-itm-direct-tunnels:
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-weekly}'
+          enable-itm-direct-tunnels: "true"
+          schedule: "{schedule-weekly}"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: ''
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: ""

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - stein:
 
     openstack:
       - stein:

-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
-
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"

 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-aluminium
     jobs:
       - inttest-csit-openstack-custom
 
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-aluminium
     jobs:
       - inttest-csit-openstack-custom
 

-    project: 'netvirt'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'n-cpu,placement-api,tempest'
-    security-group-mode: 'stateful'
+    project: "netvirt"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "n-cpu,placement-api,tempest"
+    security-group-mode: "stateful"

     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     os-cmb-cnt: 1


@@ -768,68 +766,68 @@
 
     stream:
       - aluminium:
 
     stream:
       - aluminium:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

 
     topology:
       - 1node:
           openstack_system2_count: 0
           odl_system_count: 1
 
     topology:
       - 1node:
           openstack_system2_count: 0
           odl_system_count: 1

-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"

       - 3node:
           openstack_system2_count: 1
           odl_system_count: 3
       - 3node:
           openstack_system2_count: 1
           odl_system_count: 3

-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"

 
     functionality:
       - upstream-stateful:
 
     functionality:
       - upstream-stateful:

-          schedule: '{schedule-daily}'
+          schedule: "{schedule-daily}"

       - upstream-stateful-itm-direct-tunnels:
       - upstream-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-daily}'
+          enable-itm-direct-tunnels: "true"
+          schedule: "{schedule-daily}"

       - upstream-stateful-snat-conntrack:
       - upstream-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:

-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"

       - gate-stateful-snat-conntrack:
       - gate-stateful-snat-conntrack:

-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"

       - gate-minimal-cluster:
       - gate-minimal-cluster:

-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"

       - dcgw:
       - dcgw:

-          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"

           tools_system_count: 3
           tools_system_count: 3

-          enable-gre-type-driver: 'yes'
-          schedule: '{schedule-daily}'
+          enable-gre-type-driver: "yes"
+          schedule: "{schedule-daily}"

       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:

-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: ''
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: ""

       - tempest-stateful:
       - tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-daily}"

       - tempest-stateful-snat-conntrack:
       - tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-daily}"

       - gate-tempest-stateful:
       - gate-tempest-stateful:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"

       - gate-tempest-stateful-snat-conntrack:
       - gate-tempest-stateful-snat-conntrack:

-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"

 
     openstack:
       - stein:
 
     openstack:
       - stein:

-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"

diff --git a/jjb/netvirt/netvirt-dependencies.yaml b/jjb/netvirt/netvirt-dependencies.yaml
index be7f09c5f0907fdc18df622dc930d82015d6d375..60c436556bd475f1d590c5eb5c2154d08f0394bd 100644 (file)
--- a/jjb/netvirt/netvirt-dependencies.yaml
+++ b/jjb/netvirt/netvirt-dependencies.yaml
@@ -1,20 +1,20 @@
 ---
 - project:
     name: netvirt-thirdparty-quagga-dependencies
 ---
 - project:
     name: netvirt-thirdparty-quagga-dependencies

-    project: 'netvirt'
-    project-name: 'netvirt'
+    project: "netvirt"
+    project-name: "netvirt"

     jobs:
     jobs:

-      - 'netvirt-thirdparty-quagga-{platform}'
+      - "netvirt-thirdparty-quagga-{platform}"

 
 

-    quagga-version: '5'
-    mvn-opts: ''
-    mvn-params: ''
+    quagga-version: "5"
+    mvn-opts: ""
+    mvn-params: ""

     mvn-version: mvn35
 
     # common parameters required for 'lf-infra-deploy-maven-file' builder
     mvn-version: mvn35
 
     # common parameters required for 'lf-infra-deploy-maven-file' builder

-    repo-id: 'thirdparty'
-    upload-files-dir: '$WORKSPACE/upload_files'
-    group-id: 'quagga$QUAGGA_VERSION'
+    repo-id: "thirdparty"
+    upload-files-dir: "$WORKSPACE/upload_files"
+    group-id: "quagga$QUAGGA_VERSION"

 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba


@@ -28,68 +28,68 @@
           build-node: ubuntu1804-mininet-ovs-25-1c-4g
 
 - job-template:
           build-node: ubuntu1804-mininet-ovs-25-1c-4g
 
 - job-template:

-    name: 'netvirt-thirdparty-quagga-{platform}'
+    name: "netvirt-thirdparty-quagga-{platform}"

     project-type: freestyle
     project-type: freestyle

-    node: '{build-node}'
+    node: "{build-node}"

     concurrent: true
 
     properties:
       - opendaylight-infra-properties:
     concurrent: true
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
-          staging-profile-id: '{staging-profile-id}'
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+          staging-profile-id: "{staging-profile-id}"

       - string:
           name: QUAGGA_VERSION
       - string:
           name: QUAGGA_VERSION

-          default: '{quagga-version}'
-          description: 'quagga version'
+          default: "{quagga-version}"
+          description: "quagga version"

 
     scm:
       - git-netvirt-quagga
 
     wrappers:
       - opendaylight-infra-wrappers:
 
     scm:
       - git-netvirt-quagga
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - lf-infra-pre-build
       - netvirt-build-quagga
       - lf-infra-deploy-maven-file:
 
     builders:
       - lf-infra-pre-build
       - netvirt-build-quagga
       - lf-infra-deploy-maven-file:

-          global-settings-file: 'global-settings'
-          settings-file: 'netvirt-settings'
-          mvn-version: '{mvn-version}'
-          repo-id: '{repo-id}'
-          group-id: '{group-id}'
-          upload-files-dir: '{upload-files-dir}'
-          maven-repo-url: '$NEXUS_URL/content/repositories/thirdparty'
+          global-settings-file: "global-settings"
+          settings-file: "netvirt-settings"
+          mvn-version: "{mvn-version}"
+          repo-id: "{repo-id}"
+          group-id: "{group-id}"
+          upload-files-dir: "{upload-files-dir}"
+          maven-repo-url: "$NEXUS_URL/content/repositories/thirdparty"

 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[netvirt]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[netvirt]"

       - lf-infra-publish
 
 - builder:
       - lf-infra-publish
 
 - builder:

-    name: 'netvirt-build-quagga'
+    name: "netvirt-build-quagga"

     builders:
       - shell: !include-raw-escape: quagga-build.sh
 
 - scm:
     builders:
       - shell: !include-raw-escape: quagga-build.sh
 
 - scm:

-    name: 'git-netvirt-quagga'
+    name: "git-netvirt-quagga"

     scm:
       - git:
           url: https://github.com/6WIND/zrpcd.git
     scm:
       - git:
           url: https://github.com/6WIND/zrpcd.git

-          basedir: 'zrpcd'
+          basedir: "zrpcd"

           branches:
           branches:

-            - 'issue_32_bis'
+            - "issue_32_bis"

           wipe-workspace: true
           wipe-workspace: true

diff --git a/jjb/netvirt/netvirt-job-reports.yaml b/jjb/netvirt/netvirt-job-reports.yaml
index 5ea926796848160a1d295c513d16fd77797f7a2b..93151bf130ff98bc37b233aa5a6ae793475bbbc7 100644 (file)
--- a/jjb/netvirt/netvirt-job-reports.yaml
+++ b/jjb/netvirt/netvirt-job-reports.yaml
@@ -5,14 +5,14 @@
     jobs:
       - netvirt-job-reports
     report-jobnames: >
     jobs:
       - netvirt-job-reports
     report-jobnames: >

-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
-        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium
-    report-logurl: 'https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1'
+      netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
+      netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium
+    report-logurl: "https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1"

     report-numjobs: 100
     report-numjobs: 100

-    report-path: '/tmp/jobreports'
+    report-path: "/tmp/jobreports"

 
 - job-template:
 
 - job-template:

-    name: '{prefix}netvirt-job-reports'
+    name: "{prefix}netvirt-job-reports"

     id: netvirt-job-reports
     node: centos7-builder-2c-2g
     project-type: freestyle
     id: netvirt-job-reports
     node: centos7-builder-2c-2g
     project-type: freestyle


@@ -20,44 +20,44 @@
 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - string:
           name: JOB_NAMES
       - string:
           name: JOB_NAMES

-          default: '{report-jobnames}'
+          default: "{report-jobnames}"

           description: |
           description: |

-              Space separated list of job names to process. Example:
-              netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
-              netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium
+            Space separated list of job names to process. Example:
+            netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
+            netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium

       - string:
           name: LOG_URL
       - string:
           name: LOG_URL

-          default: '{report-logurl}'
-          description: 'Logs url'
+          default: "{report-logurl}"
+          description: "Logs url"

       - string:
           name: NUM_JOBS
       - string:
           name: NUM_JOBS

-          default: '{report-numjobs}'
-          description: 'Number of jobs to process'
+          default: "{report-numjobs}"
+          description: "Number of jobs to process"

       - string:
           name: REPORT_PATH
       - string:
           name: REPORT_PATH

-          default: '{report-path}'
-          description: 'Output path to write files'
+          default: "{report-path}"
+          description: "Output path to write files"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - run-job-reports
 
     triggers:
 
     builders:
       - run-job-reports
 
     triggers:

-      - timed: '@daily'
+      - timed: "@daily"

 
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 78bcead95440b0d789ad0b138316d08af58fe7a6..949f7d406f7319bf955892272cc3b47d423eb450 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -4,62 +4,62 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'netvirt'
+    project: "netvirt"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'rocky'
+    os-branch: "rocky"

 
 

-    jdk: 'openjdk8'
+    jdk: "openjdk8"

 
     feature:
       - current:
           csit-list: >
 
     feature:
       - current:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

       - cluster-current:
           csit-list: >
       - cluster-current:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

       - cluster-minimal-current:
           csit-list: >
       - cluster-minimal-current:
           csit-list: >

-               netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-minimal-cluster-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-minimal-cluster-{stream}

       - snat-conntrack:
           csit-list: >
       - snat-conntrack:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}

       - cluster-snat-conntrack:
           csit-list: >
       - cluster-snat-conntrack:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}

       - l2gw:
           csit-list: >
       - l2gw:
           csit-list: >

-              netvirt-csit-hwvtep-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-hwvtep-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

       - tdd-wip:
           csit-list: >
       - tdd-wip:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}

       - itm-direct-tunnels:
           csit-list: >
       - itm-direct-tunnels:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}

       - upgrade:
           csit-list: >
       - upgrade:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-upgrade-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-upgrade-{stream}

       - tempest:
           csit-list: >
       - tempest:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}

       - cluster-tempest:
           csit-list: >
       - cluster-tempest:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}

       - tempest-snat-conntrack:
           csit-list: >
       - tempest-snat-conntrack:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}

       - cluster-tempest-snat-conntrack:
           csit-list: >
       - cluster-tempest-snat-conntrack:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 11ee0f7c2bbb84421e7a68a6ce41fc3153db8259..eb051ddd242d78d3e3d32c71ecbe688c52c955ca 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -2,9 +2,9 @@
 - project:
     name: netvirt-silicon
     jobs:
 - project:
     name: netvirt-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt


@@ -14,27 +14,27 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: silicon
     block_on_csit: false
 
     stream: silicon

-    branch: 'master'
+    branch: "master"

 
 

-    project: 'netvirt'
-    project-name: 'netvirt'
+    project: "netvirt"
+    project-name: "netvirt"

 
 

-    java-version: 'openjdk11'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m'
+    java-version: "openjdk11"
+    mvn-settings: "netvirt-settings"
+    mvn-opts: "-Xmx2048m"

     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >
     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >

-        genius-merge-{stream},
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+      genius-merge-{stream},
+      neutron-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"

 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba


@@ -42,9 +42,9 @@
 - project:
     name: netvirt-aluminium
     jobs:
 - project:
     name: netvirt-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt


@@ -54,27 +54,27 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: aluminium
     block_on_csit: false
 
     stream: aluminium

-    branch: 'stable/aluminium'
+    branch: "stable/aluminium"

 
 

-    project: 'netvirt'
-    project-name: 'netvirt'
+    project: "netvirt"
+    project-name: "netvirt"

 
 

-    java-version: 'openjdk11'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m'
+    java-version: "openjdk11"
+    mvn-settings: "netvirt-settings"
+    mvn-opts: "-Xmx2048m"

     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >
     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >

-        genius-merge-{stream},
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+      genius-merge-{stream},
+      neutron-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"

 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba


@@ -82,9 +82,9 @@
 - project:
     name: netvirt-magnesium
     jobs:
 - project:
     name: netvirt-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt


@@ -94,27 +94,27 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: magnesium
     block_on_csit: false
 
     stream: magnesium

-    branch: 'stable/magnesium'
+    branch: "stable/magnesium"

 
 

-    project: 'netvirt'
-    project-name: 'netvirt'
+    project: "netvirt"
+    project-name: "netvirt"

 
 

-    java-version: 'openjdk11'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m'
+    java-version: "openjdk11"
+    mvn-settings: "netvirt-settings"
+    mvn-opts: "-Xmx2048m"

     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >
     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >

-        genius-merge-{stream},
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+      genius-merge-{stream},
+      neutron-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"

 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba


@@ -122,9 +122,9 @@
 - project:
     name: netvirt-sodium
     jobs:
 - project:
     name: netvirt-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt


@@ -134,25 +134,25 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: sodium
     block_on_csit: false
 
     stream: sodium

-    branch: 'stable/sodium'
+    branch: "stable/sodium"

 
 

-    project: 'netvirt'
-    project-name: 'netvirt'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx2048m'
+    project: "netvirt"
+    project-name: "netvirt"
+    mvn-settings: "netvirt-settings"
+    mvn-opts: "-Xmx2048m"

     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >
     build-timeout: 90
     build-node: centos7-builder-8c-8g
     dependencies: >

-        genius-merge-{stream},
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
+      genius-merge-{stream},
+      neutron-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream},
+      ovsdb-merge-{stream}
+    email-upstream: "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]"

 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba


@@ -162,24 +162,24 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'netvirt'
-    project-name: 'netvirt'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'netvirt-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "netvirt"
+    project-name: "netvirt"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "netvirt-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: netvirt-csit-view
     views:
       - csit-view
     view-name: netvirt-csit
 
 - project:
     name: netvirt-csit-view
     views:
       - csit-view
     view-name: netvirt-csit

-    view-description: 'List of netvirt-csit jobs'
-    view-regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
+    view-description: "List of netvirt-csit jobs"
+    view-regex: "netvirt-csit(?!(.*gate)|(.*hwvtep)).*"

 
 - project:
     name: netvirt
 
 - project:
     name: netvirt

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
index c0512be767a1dc733331092473665cc241ee9dab..95a762f823878fe2d12622d1c2c61cda1cfd476c 100644 (file)
--- a/jjb/neutron/neutron-patch-test.yaml
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -4,31 +4,31 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'neutron'
+    project: "neutron"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
+    os-branch: "queens"

 
 

-    jdk: 'openjdk8'
+    jdk: "openjdk8"

 
     feature:
       - netvirt:
           csit-list: >
 
     feature:
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index b6d3dc8384859b4dc5747b9823854674aa56a8d8..2986e88b0f27eb8406a3171357286a43747c16a9 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -2,21 +2,21 @@
 - project:
     name: neutron-silicon
     jobs:
 - project:
     name: neutron-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'neutron'
-    project-name: 'neutron'
+    project: "neutron"
+    project-name: "neutron"

     build-timeout: 90
     build-timeout: 90

-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"

 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419


@@ -24,21 +24,21 @@
 - project:
     name: neutron-aluminium
     jobs:
 - project:
     name: neutron-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'neutron'
-    project-name: 'neutron'
+    project: "neutron"
+    project-name: "neutron"

     build-timeout: 90
     build-timeout: 90

-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"

 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419


@@ -46,21 +46,21 @@
 - project:
     name: neutron-magnesium
     jobs:
 - project:
     name: neutron-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'neutron'
-    project-name: 'neutron'
+    project: "neutron"
+    project-name: "neutron"

     build-timeout: 90
     build-timeout: 90

-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"

 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419


@@ -68,20 +68,20 @@
 - project:
     name: neutron-sodium
     jobs:
 - project:
     name: neutron-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'neutron'
-    project-name: 'neutron'
+    project: "neutron"
+    project-name: "neutron"

     build-timeout: 90
     build-timeout: 90

-    branch: 'stable/sodium'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
+    branch: "stable/sodium"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[neutron] [odlparent] [aaa]"

 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419


@@ -90,16 +90,16 @@
     name: neutron-sonar
     jobs:
       - gerrit-maven-sonar
     name: neutron-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "neutron"
+    project-name: "neutron"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "neutron-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: neutron-info
 
 - project:
     name: neutron-info

diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml
index 7fe2ab15d8911be2955a4d0d53134d4849510ed4..9c4e513f5c214370a4cfde58c67cb48ae4492cd8 100644 (file)
--- a/jjb/odlguice/odlguice.yaml
+++ b/jjb/odlguice/odlguice.yaml
@@ -6,15 +6,15 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'odlguice'
-    project-name: 'odlguice'
+    project: "odlguice"
+    project-name: "odlguice"

     build-node: centos7-builder-2c-2g
     build-timeout: 120
     build-node: centos7-builder-2c-2g
     build-timeout: 120

-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'odlguice-settings'
-    mvn-opts: '-Xmx2048m'
-    email-upstream: '[app-dev]'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "odlguice-settings"
+    mvn-opts: "-Xmx2048m"
+    email-upstream: "[app-dev]"

 
     # Used by the release job
     staging-profile-id: 44ce7d1aad49e
 
     # Used by the release job
     staging-profile-id: 44ce7d1aad49e


@@ -26,15 +26,15 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'odlguice'
-    project-name: 'odlguice'
+    project: "odlguice"
+    project-name: "odlguice"

     build-node: centos7-builder-2c-2g
     build-timeout: 120
     build-node: centos7-builder-2c-2g
     build-timeout: 120

-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'odlguice-settings'
-    mvn-opts: '-Xmx2048m'
-    email-upstream: '[app-dev]'
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "odlguice-settings"
+    mvn-opts: "-Xmx2048m"
+    email-upstream: "[app-dev]"

 
     # Used by the release job
     staging-profile-id: 44ce7d1aad49e
 
     # Used by the release job
     staging-profile-id: 44ce7d1aad49e


@@ -58,15 +58,15 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'odlguice'
-    project-name: 'odlguice'
-    branch: 'master'
-    mvn-settings: 'odlguice-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "odlguice"
+    project-name: "odlguice"
+    branch: "master"
+    mvn-settings: "odlguice-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: odlguice-info
 
 - project:
     name: odlguice-info

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index 10eb477e763e330c770dba80dd4e144ee18b1eeb..2aa4b0e5501ba8233569527cb6425ca8a0b7e5f2 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -7,13 +7,13 @@
 
     stream: silicon
     project: odlmicro
 
     stream: silicon
     project: odlmicro

-    project-name: 'odlmicro'
-    branch: 'master'
-    java-version: 'openjdk11'
+    project-name: "odlmicro"
+    branch: "master"
+    java-version: "openjdk11"

     build-node: centos7-builder-2c-2g
     build-timeout: 60
     build-node: centos7-builder-2c-2g
     build-timeout: 60

-    mvn-settings: 'odlmicro-settings'
-    mvn-opts: '-Xmx2048m'
+    mvn-settings: "odlmicro-settings"
+    mvn-opts: "-Xmx2048m"

 
     # Used by the release job
     staging-profile-id: 44ce67428fd0d
 
     # Used by the release job
     staging-profile-id: 44ce67428fd0d


@@ -26,13 +26,13 @@
 
     stream: aluminium
     project: odlmicro
 
     stream: aluminium
     project: odlmicro

-    project-name: 'odlmicro'
-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
+    project-name: "odlmicro"
+    branch: "stable/aluminium"
+    java-version: "openjdk11"

     build-node: centos7-builder-2c-2g
     build-timeout: 60
     build-node: centos7-builder-2c-2g
     build-timeout: 60

-    mvn-settings: 'odlmicro-settings'
-    mvn-opts: '-Xmx2048m'
+    mvn-settings: "odlmicro-settings"
+    mvn-opts: "-Xmx2048m"

 
     # Used by the release job
     staging-profile-id: 44ce67428fd0d
 
     # Used by the release job
     staging-profile-id: 44ce67428fd0d


@@ -56,15 +56,15 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'odlmicro'
-    project-name: 'odlmicro'
-    branch: 'master'
-    mvn-settings: 'odlmicro-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "odlmicro"
+    project-name: "odlmicro"
+    branch: "master"
+    mvn-settings: "odlmicro-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: odlmicro-info
 
 - project:
     name: odlmicro-info

diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml
index d5e40bee2f133a7d5af7e14f867db2929a7872d1..83cf52c094f76cd25ef6cb850b3fe6f7e72dc0a7 100644 (file)
--- a/jjb/odlparent/odlparent-patch-test.yaml
+++ b/jjb/odlparent/odlparent-patch-test.yaml
@@ -4,31 +4,31 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'odlparent'
+    project: "odlparent"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
+    os-branch: "queens"

 
 

-    jdk: 'openjdk8'
+    jdk: "openjdk8"

 
     feature:
       - netvirt:
           csit-list: >
 
     feature:
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index fa9499fd40a8043890a5cf7b538c24e3f56b3415..599d0438561ec3bcf70a1a8531d964f8b46e3c6a 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,7 +2,7 @@
 - project:
     name: odlparent-master
     jobs:
 - project:
     name: odlparent-master
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent


@@ -17,19 +17,19 @@
     stream: master
     branch: master
 
     stream: master
     branch: master
 

-    java-version: 'openjdk11'
+    java-version: "openjdk11"

     mvn-settings: odlparent-settings
     mvn-version: mvn36
 
     mvn-settings: odlparent-settings
     mvn-version: mvn36
 

-    dependencies: ''
-    email-upstream: '[odlparent]'
+    dependencies: ""
+    email-upstream: "[odlparent]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
     # Used by the release job
     staging-profile-id: 880d5ac25eaa


@@ -37,7 +37,7 @@
 - project:
     name: odlparent-6.0.x
     jobs:
 - project:
     name: odlparent-6.0.x
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent


@@ -52,20 +52,20 @@
     stream: 6.0.x
     branch: 6.0.x
 
     stream: 6.0.x
     branch: 6.0.x
 

-    java-version: 'openjdk11'
+    java-version: "openjdk11"

     mvn-settings: odlparent-settings
     mvn-settings: odlparent-settings

-    mvn-opts: '-Xmx1024m'
+    mvn-opts: "-Xmx1024m"

     mvn-version: mvn35
 
     mvn-version: mvn35
 

-    dependencies: ''
-    email-upstream: '[odlparent]'
+    dependencies: ""
+    email-upstream: "[odlparent]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
     # Used by the release job
     staging-profile-id: 880d5ac25eaa


@@ -73,7 +73,7 @@
 - project:
     name: odlparent-5.0.x
     jobs:
 - project:
     name: odlparent-5.0.x
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
       - gerrit-tox-verify
       - odl-maven-jobs
       - odl-maven-verify-jobs
       - gerrit-tox-verify


@@ -84,18 +84,18 @@
     branch: 5.0.x
 
     mvn-settings: odlparent-settings
     branch: 5.0.x
 
     mvn-settings: odlparent-settings

-    mvn-opts: '-Xmx1024m'
+    mvn-opts: "-Xmx1024m"

     mvn-version: mvn35
 
     mvn-version: mvn35
 

-    dependencies: ''
-    email-upstream: '[odlparent]'
+    dependencies: ""
+    email-upstream: "[odlparent]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
     # Used by the release job
     staging-profile-id: 880d5ac25eaa


@@ -119,16 +119,16 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'odlparent-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "odlparent"
+    project-name: "odlparent"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "odlparent-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: odlparent-info
 
 - project:
     name: odlparent-info

diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
index 25abe00ba32e8710f104efa9cf14be959ab01a34..2ece2821d669493b0ea31e1937a7b1e497696bc4 100644 (file)
--- a/jjb/odlsaf/odlsaf.yaml
+++ b/jjb/odlsaf/odlsaf.yaml
@@ -6,15 +6,15 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'odlsaf'
-    project-name: 'odlsaf'
+    project: "odlsaf"
+    project-name: "odlsaf"

     build-node: centos7-builder-2c-2g
     build-timeout: 120
     build-node: centos7-builder-2c-2g
     build-timeout: 120

-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'odlsaf-settings'
-    mvn-opts: '-Xmx2048m'
-    email-upstream: '[app-dev]'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "odlsaf-settings"
+    mvn-opts: "-Xmx2048m"
+    email-upstream: "[app-dev]"

 
     # Used by the release job
     staging-profile-id: 2802f0e38ee665
 
     # Used by the release job
     staging-profile-id: 2802f0e38ee665


@@ -26,15 +26,15 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'odlsaf'
-    project-name: 'odlsaf'
+    project: "odlsaf"
+    project-name: "odlsaf"

     build-node: centos7-builder-2c-2g
     build-timeout: 120
     build-node: centos7-builder-2c-2g
     build-timeout: 120

-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'odlsaf-settings'
-    mvn-opts: '-Xmx2048m'
-    email-upstream: '[app-dev]'
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "odlsaf-settings"
+    mvn-opts: "-Xmx2048m"
+    email-upstream: "[app-dev]"

 
     # Used by the release job
     staging-profile-id: 2802f0e38ee665
 
     # Used by the release job
     staging-profile-id: 2802f0e38ee665


@@ -58,15 +58,15 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'odlsaf'
-    project-name: 'odlsaf'
-    branch: 'master'
-    mvn-settings: 'odlsaf-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "odlsaf"
+    project-name: "odlsaf"
+    branch: "master"
+    mvn-settings: "odlsaf-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: odlsaf-info
 
 - project:
     name: odlsaf-info

diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml
index ae939f582a485aa561603b7e99786e3ec26ca343..2ae9bab6ad11af47aebb84abeebbfeb5a4592560 100644 (file)
--- a/jjb/odltools/odltools-csit.yaml
+++ b/jjb/odltools/odltools-csit.yaml
@@ -7,25 +7,25 @@
 
     project: odltools
     tools_system_count: 0
 
     project: odltools
     tools_system_count: 0

-    testplan: '{project}-basic.txt'
+    testplan: "{project}-basic.txt"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     functionality:
 
     functionality:

-      - 'upstream'
-      - 'gate'
+      - "upstream"
+      - "gate"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml
index a7feb59969f4c7b83addea87ebd696e6f128c174..721535e2ad2fcbe401b4c135eb6c0d93ce6caa91 100644 (file)
--- a/jjb/odltools/odltools-patch-test.yaml
+++ b/jjb/odltools/odltools-patch-test.yaml
@@ -9,15 +9,15 @@
 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     feature:
       - current:
           csit-list: >
 
     feature:
       - current:
           csit-list: >

-              odltools-csit-1node-gate-all-{stream}
+            odltools-csit-1node-gate-all-{stream}

diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml
index 99b4bd25961a5bd1eff90f290e404fdc13937296..00ae32addb2176d35b69ab452dd6be396f5086ee 100644 (file)
--- a/jjb/odltools/odltools.yaml
+++ b/jjb/odltools/odltools.yaml
@@ -3,7 +3,7 @@
     name: odltools
     jobs:
       - gerrit-tox-verify
     name: odltools
     jobs:
       - gerrit-tox-verify

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odltools
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odltools


@@ -12,19 +12,19 @@
 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     project: odltools
     project-name: odltools
     build-node: centos7-builder-2c-2g
     build-timeout: 60
 
     project: odltools
     project-name: odltools
     build-node: centos7-builder-2c-2g
     build-timeout: 60

-    mvn-settings: 'odltools-settings'
+    mvn-settings: "odltools-settings"

 
 - project:
     name: odltools-release-management
 
 - project:
     name: odltools-release-management


@@ -45,15 +45,15 @@
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 

-    project: 'odltools'
-    project-name: 'odltools'
-    branch: 'master'
-    mvn-settings: 'odltools-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "odltools"
+    project-name: "odltools"
+    branch: "master"
+    mvn-settings: "odltools-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: odltools-info
 
 - project:
     name: odltools-info

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 14ff1017410b37521cf6781977a8ac3bc768ba94..79f6bd8aa4b8391c8d47ef04d76c34a367f2d943 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -6,13 +6,13 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'master'
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "of-config"
+    project-name: "of-config"
+    branch: "master"
+    mvn-settings: "of-config-settings"
+    mvn-opts: "-Xmx1024m"

     dependencies: netconf-merge-{stream}'
     dependencies: netconf-merge-{stream}'

-    email-upstream: '[of-config] [netconf]'
+    email-upstream: "[of-config] [netconf]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -25,13 +25,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/aluminium'
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "of-config"
+    project-name: "of-config"
+    branch: "stable/aluminium"
+    mvn-settings: "of-config-settings"
+    mvn-opts: "-Xmx1024m"

     dependencies: netconf-merge-{stream}'
     dependencies: netconf-merge-{stream}'

-    email-upstream: '[of-config] [netconf]'
+    email-upstream: "[of-config] [netconf]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -44,13 +44,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/magnesium'
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "of-config"
+    project-name: "of-config"
+    branch: "stable/magnesium"
+    mvn-settings: "of-config-settings"
+    mvn-opts: "-Xmx1024m"

     dependencies: netconf-merge-{stream}'
     dependencies: netconf-merge-{stream}'

-    email-upstream: '[of-config] [netconf]'
+    email-upstream: "[of-config] [netconf]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -63,13 +63,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/sodium'
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "of-config"
+    project-name: "of-config"
+    branch: "stable/sodium"
+    mvn-settings: "of-config-settings"
+    mvn-opts: "-Xmx1024m"

     dependencies: netconf-merge-{stream}'
     dependencies: netconf-merge-{stream}'

-    email-upstream: '[of-config] [netconf]'
+    email-upstream: "[of-config] [netconf]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -90,16 +90,16 @@
     name: of-config-sonar
     jobs:
       - gerrit-maven-sonar
     name: of-config-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'master'
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "of-config"
+    project-name: "of-config"
+    branch: "master"
+    mvn-settings: "of-config-settings"
+    mvn-opts: "-Xmx1024m"

     disable-job: true
     sonarcloud: true
     disable-job: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: of-config-info
 
 - project:
     name: of-config-info

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index 48ad853c05a17ebe14705fb7b36a6ed5d82a2cf5..f5f807aa23af50659a1429cff64e5354b27e9846 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -4,31 +4,31 @@
     jobs:
       - inttest-csit-1node
 
     jobs:
       - inttest-csit-1node
 

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
 

-    functionality: 'bundle-based-reconciliation'
+    functionality: "bundle-based-reconciliation"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Job images
     tools_system_count: 2
 
     # Job images
     tools_system_count: 2

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-openflowplugin-flow-services-rest'
+    install-features: "odl-openflowplugin-flow-services-rest"

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index f26a3385d62d5a05e2f723fa4fd23100ffa51ceb..c2ef850fcc77599b1355ace0ecda7152733d2fc2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -5,44 +5,44 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'cbench'
+    functionality: "cbench"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
+    install-features: "odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:1000'
+    robot-options: "-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:1000"

 
     # Plot Info
 
     # Plot Info

-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
+    01-plot-title: "Throughput Mode"
+    01-plot-yaxis: "flow_mods/sec"
+    01-plot-group: "Cbench Performance"
+    01-plot-data-file: "throughput.csv"
+    02-plot-title: "Latency Mode"
+    02-plot-yaxis: "flow_mods/sec"
+    02-plot-group: "Cbench Performance"
+    02-plot-data-file: "latency.csv"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index e102cc38e5254bee4490db3a60b82f63fd34da03..daa0301f44598e8d796d406f4998e79994ad4563 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,26 +15,26 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic'
+    install-features: "odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v ODL_OF_PLUGIN:lithium'
+    robot-options: "-v ODL_OF_PLUGIN:lithium"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 51f4533e5daa030a4489b2bcdbfcbf0d8938898c..0ecd099172b37e9f5f02be726ba8867c4341c60b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,39 +15,39 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-bulk-o-matic,
+      odl-jolokia

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2250'
+    robot-options: "-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2250"

 
     # Plot Info
 
     # Plot Info

-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Java Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Java Performance'
-    02-plot-data-file: 'time.csv'
+    01-plot-title: "Flow Add rate"
+    01-plot-yaxis: "flow_mods/sec"
+    01-plot-group: "Java Performance"
+    01-plot-data-file: "rate.csv"
+    02-plot-title: "Flow Add time"
+    02-plot-yaxis: "seconds"
+    02-plot-group: "Java Performance"
+    02-plot-data-file: "time.csv"

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index f933ccbce7114323187e18774ed8fb00a3e8ac5f..87efd370c7eefee5a597df881e6ca12631dae06c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,28 +15,28 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-table-miss-enforcer

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v ODL_OF_PLUGIN:lithium'
+    robot-options: "-v ODL_OF_PLUGIN:lithium"

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index c1c392ff37851941aec630f1a0030f8b83b099ca..06145c2a45e7291b879f075b9dfd3a4c9009f493 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,29 +15,29 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
-          install: 'all'
+          branch: "master"
+          jre: "openjdk11"
+          install: "all"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
-          install: 'all'
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+          install: "all"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-          install: 'all'
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+          install: "all"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
-          install: 'all'
+          branch: "stable/sodium"
+          install: "all"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        odl-openflowplugin-nxm-extensions
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-table-miss-enforcer,
+      odl-openflowplugin-nxm-extensions

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index b41d61555e22166e2088bd15e22cad1ce50cd12c..f84aa3beb0645159c702f87a599b188af7190bce 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -5,11 +5,11 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

     build-timeout: 1440
 
     # The functionality under test
     build-timeout: 1440
 
     # The functionality under test

-    functionality: 'longevity'
+    functionality: "longevity"

 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'


@@ -17,28 +17,28 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-table-miss-enforcer

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v TEST_LENGTH:23h -v NUM_SWITCHES:16'
+    robot-options: "-v TEST_LENGTH:23h -v NUM_SWITCHES:16"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 27a3fabaf639931f9a80796dc40fa67abe7011d2..3c1a6b6bd41f44b7153a924b6aa039a3ccc31263 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,39 +15,39 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-bulk-o-matic,
+      odl-jolokia

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125'
+    robot-options: "-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125"

 
     # Plot Info
 
     # Plot Info

-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Java Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Java Performance'
-    02-plot-data-file: 'time.csv'
+    01-plot-title: "Flow Add rate"
+    01-plot-yaxis: "flow_mods/sec"
+    01-plot-group: "Java Performance"
+    01-plot-data-file: "rate.csv"
+    02-plot-title: "Flow Add time"
+    02-plot-yaxis: "seconds"
+    02-plot-group: "Java Performance"
+    02-plot-data-file: "time.csv"

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 1ff6ef0a810ef1bf291e297801b26dec938d4996..425760448921b095ad94ec3a1f3ca2c2ef70e4ec 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,37 +15,37 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    odl_system_flavor: 'odl-standard-4'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    odl_system_flavor: "odl-standard-4"
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-openflowplugin-flow-services-rest'
+    install-features: "odl-openflowplugin-flow-services-rest"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v flnr:100000 -v swnr:32 -v fpr:200'
+    robot-options: "-v flnr:100000 -v swnr:32 -v fpr:200"

 
     # Plot Info
 
     # Plot Info

-    01-plot-title: 'Stats Collection Rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Stats Collection Performance'
-    01-plot-data-file: 'stats_rate.csv'
-    02-plot-title: 'Stats Collection Time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Stats Collection Performance'
-    02-plot-data-file: 'stats_time.csv'
+    01-plot-title: "Stats Collection Rate"
+    01-plot-yaxis: "flow_mods/sec"
+    01-plot-group: "Stats Collection Performance"
+    01-plot-data-file: "stats_rate.csv"
+    02-plot-title: "Stats Collection Time"
+    02-plot-yaxis: "seconds"
+    02-plot-group: "Stats Collection Performance"
+    02-plot-data-file: "stats_time.csv"

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index bb1f512093cc464dd2a3e0446b297b9ce03bcd30..8abdcc3d6861fce66df51c7e0a9f9ae9f4909078 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -6,37 +6,37 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'sanity'
+    functionality: "sanity"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        odl-openflowplugin-nxm-extensions
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-table-miss-enforcer,
+      odl-openflowplugin-nxm-extensions

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v SWITCHES:3'
+    robot-options: "-v SWITCHES:3"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index b1b06444a51ef9356ed4db1efcf16bad7012cc84..ea43e5dcd4aeabcbd81e1b71ada85925841bf256 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -5,46 +5,46 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'scale-link'
+    functionality: "scale-link"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-table-miss-enforcer

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

 
     # Plot Info
 
     # Plot Info

-    01-plot-title: 'Maximum Links Full Mesh Topology'
-    01-plot-yaxis: 'Links'
-    01-plot-group: 'Link Scalability'
-    01-plot-data-file: 'links.csv'
-    02-plot-title: 'Topology Discover Time'
-    02-plot-yaxis: 'Seconds'
-    02-plot-group: 'Link Scalability'
-    02-plot-data-file: 'time.csv'
+    01-plot-title: "Maximum Links Full Mesh Topology"
+    01-plot-yaxis: "Links"
+    01-plot-group: "Link Scalability"
+    01-plot-data-file: "links.csv"
+    02-plot-title: "Topology Discover Time"
+    02-plot-yaxis: "Seconds"
+    02-plot-group: "Link Scalability"
+    02-plot-data-file: "time.csv"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 41ea379aaa4cbf2227f023d8a998e319acffa006..540d189c4e77e32414f96a4dca5961db53ac12b4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -5,45 +5,45 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'scale-switch'
+    functionality: "scale-switch"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest
+      odl-openflowplugin-flow-services-rest

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

 
     # Plot Info
 
     # Plot Info

-    01-plot-title: 'Maximum Switches Linear Topology'
-    01-plot-yaxis: 'Switches'
-    01-plot-group: 'Switch Scalability'
-    01-plot-data-file: 'switches.csv'
-    02-plot-title: 'Topology Discover Time'
-    02-plot-yaxis: 'Seconds'
-    02-plot-group: 'Switch Scalability'
-    02-plot-data-file: 'time.csv'
+    01-plot-title: "Maximum Switches Linear Topology"
+    01-plot-yaxis: "Switches"
+    01-plot-group: "Switch Scalability"
+    01-plot-data-file: "switches.csv"
+    02-plot-title: "Topology Discover Time"
+    02-plot-yaxis: "Seconds"
+    02-plot-group: "Switch Scalability"
+    02-plot-data-file: "time.csv"

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index e688a89b2a0f7f672c3aa6039e2ef2460e55626f..639189711881b8d3d13a87b5c1525fb633835c54 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:


@@ -15,28 +15,28 @@
     # Project branches
     stream:
       - silicon:
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Job images
 
     # Job images

-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-table-miss-enforcer

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: '-v TOPO_TREE_DEPTH:7'
+    robot-options: "-v TOPO_TREE_DEPTH:7"

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 9b4ddce74511c547323954791447b3485028eef9..24d46a306ec768887a456ed17228e546e42cab5c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -5,48 +5,48 @@
       - inttest-patch-test
 
     # The project name
       - inttest-patch-test
 
     # The project name

-    project: 'openflowplugin'
+    project: "openflowplugin"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
-    jdk: 'openjdk8'
+    os-branch: "queens"
+    jdk: "openjdk8"

 
     feature:
       - cbench:
           csit-list: >
 
     feature:
       - cbench:
           csit-list: >

-              openflowplugin-csit-1node-cbench-only-{stream}
+            openflowplugin-csit-1node-cbench-only-{stream}

 
       - core:
           csit-list: >
 
       - core:
           csit-list: >

-              openflowplugin-csit-1node-gate-flow-services-all-{stream},
-              openflowplugin-csit-1node-gate-scale-only-{stream},
-              openflowplugin-csit-1node-gate-perf-stats-collection-only-{stream},
-              openflowplugin-csit-1node-gate-perf-bulkomatic-only-{stream},
-              openflowplugin-csit-3node-gate-clustering-only-{stream},
-              openflowplugin-csit-3node-gate-clustering-bulkomatic-only-{stream},
-              openflowplugin-csit-3node-gate-clustering-perf-bulkomatic-only-{stream}
+            openflowplugin-csit-1node-gate-flow-services-all-{stream},
+            openflowplugin-csit-1node-gate-scale-only-{stream},
+            openflowplugin-csit-1node-gate-perf-stats-collection-only-{stream},
+            openflowplugin-csit-1node-gate-perf-bulkomatic-only-{stream},
+            openflowplugin-csit-3node-gate-clustering-only-{stream},
+            openflowplugin-csit-3node-gate-clustering-bulkomatic-only-{stream},
+            openflowplugin-csit-3node-gate-clustering-perf-bulkomatic-only-{stream}

 
       - netvirt:
           csit-list: >
 
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index f09216bf9ca7260cb2e1315a130ae43163ba65a6..89b880f55f83751a76e74cd243d31b188714dfda 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -2,9 +2,9 @@
 - project:
     name: openflowplugin-silicon
     jobs:
 - project:
     name: openflowplugin-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: openflowplugin
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: openflowplugin


@@ -13,25 +13,25 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: silicon
     block_on_csit: false
 
     stream: silicon

-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'master'
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    java-version: 'openjdk11'
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    mvn-opts: "-Xmx1024m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream}
+    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"

 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c


@@ -39,9 +39,9 @@
 - project:
     name: openflowplugin-aluminium
     jobs:
 - project:
     name: openflowplugin-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: openflowplugin
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: openflowplugin


@@ -50,25 +50,25 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: aluminium
     block_on_csit: false
 
     stream: aluminium

-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/aluminium'
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "stable/aluminium"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    java-version: 'openjdk11'
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    mvn-opts: "-Xmx1024m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream}
+    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"

 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c


@@ -76,9 +76,9 @@
 - project:
     name: openflowplugin-magnesium
     jobs:
 - project:
     name: openflowplugin-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: openflowplugin
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: openflowplugin


@@ -87,25 +87,25 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: magnesium
     block_on_csit: false
 
     stream: magnesium

-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/magnesium'
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "stable/magnesium"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    java-version: 'openjdk11'
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    mvn-opts: "-Xmx1024m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream}
+    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"

 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c


@@ -113,9 +113,9 @@
 - project:
     name: openflowplugin-sodium
     jobs:
 - project:
     name: openflowplugin-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: openflowplugin
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: openflowplugin


@@ -124,24 +124,24 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: sodium
     block_on_csit: false
 
     stream: sodium

-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/sodium'
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "stable/sodium"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    mvn-opts: "-Xmx1024m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream}
+    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"

 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c


@@ -151,19 +151,19 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'master'
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-timeout: 90
     build-node: centos7-builder-2c-8g
     build-timeout: 90

-    java-version: 'openjdk11'
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: openflowplugin-info
 
 - project:
     name: openflowplugin-info


@@ -178,4 +178,4 @@
     name: openflowplugin-view
     views:
       - project-view
     name: openflowplugin-view
     views:
       - project-view

-    project-name: 'openflowplugin'
+    project-name: "openflowplugin"

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 8334a7a24972c99c66654d73a48ba8cc414060df..29a884499e3f27e8ebe7ccbf8d3b67a9b8d7dfee 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -2,158 +2,158 @@
 - project:
     name: opflex
     jobs:
 - project:
     name: opflex
     jobs:

-      - 'opflex-verify-{stream}'
-      - 'opflex-merge-{stream}'
+      - "opflex-verify-{stream}"
+      - "opflex-merge-{stream}"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          libuv-version: '1.20.2'
-          rapidjson-version: '1.1.0'
-          openvswitch-version: '2.12.0'
+          branch: "master"
+          libuv-version: "1.20.2"
+          rapidjson-version: "1.1.0"
+          openvswitch-version: "2.12.0"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          libuv-version: '1.20.2'
-          rapidjson-version: '1.1.0'
-          openvswitch-version: '2.12.0'
+          branch: "stable/aluminium"
+          libuv-version: "1.20.2"
+          rapidjson-version: "1.1.0"
+          openvswitch-version: "2.12.0"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          libuv-version: '1.20.2'
-          rapidjson-version: '1.1.0'
-          openvswitch-version: '2.12.0'
+          branch: "stable/magnesium"
+          libuv-version: "1.20.2"
+          rapidjson-version: "1.1.0"
+          openvswitch-version: "2.12.0"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
+          branch: "stable/sodium"
+          libuv-version: "1.8.0"
+          rapidjson-version: "1.0.2"
+          openvswitch-version: "2.6.0"

 
 

-    project: 'opflex'
-    archive-artifacts: '**/*.tar.gz'
-    jdk: 'openjdk8'
+    project: "opflex"
+    archive-artifacts: "**/*.tar.gz"
+    jdk: "openjdk8"

 
 - job-template:
 
 - job-template:

-    name: 'opflex-verify-{stream}'
+    name: "opflex-verify-{stream}"

 
     disable-job: false
 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
 
     disable-job: false
 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true

-    jdk: '{java-version}'
-    disabled: '{disable-job}'
+    jdk: "{java-version}"
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - string:
           name: LIBUV_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: LIBUV_VERSION
           # yamllint disable-line rule:line-length

-          default: '{libuv-version}'
-          description: 'libuv version'
+          default: "{libuv-version}"
+          description: "libuv version"

       - string:
           name: RAPIDJSON_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: RAPIDJSON_VERSION
           # yamllint disable-line rule:line-length

-          default: '{rapidjson-version}'
-          description: 'rapidjson version'
+          default: "{rapidjson-version}"
+          description: "rapidjson version"

       - string:
           name: OPENVSWITCH_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: OPENVSWITCH_VERSION
           # yamllint disable-line rule:line-length

-          default: '{openvswitch-version}'
-          description: 'openvswitch-version'
+          default: "{openvswitch-version}"
+          description: "openvswitch-version"

 
     scm:
       - gerrit-trigger-scm:
 
     scm:
       - gerrit-trigger-scm:

-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
       - gerrit-trigger-patch-submitted:
 
     triggers:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
+          forbidden-files: ""

 
     builders:
       - opflex-build:
 
     builders:
       - opflex-build:

-          mvn33: 'mvn33'
-          stream: '{stream}'
+          mvn33: "mvn33"
+          stream: "{stream}"

 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[opflex]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[opflex]"

       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: 'opflex-merge-{stream}'
+    name: "opflex-merge-{stream}"

 
     node: centos7-builder-2c-8g
 
     node: centos7-builder-2c-8g

-    jdk: '{java-version}'
+    jdk: "{java-version}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: ''
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: ""

       - string:
           name: LIBUV_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: LIBUV_VERSION
           # yamllint disable-line rule:line-length

-          default: '{libuv-version}'
-          description: 'libuv version'
+          default: "{libuv-version}"
+          description: "libuv version"

       - string:
           name: RAPIDJSON_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: RAPIDJSON_VERSION
           # yamllint disable-line rule:line-length

-          default: '{rapidjson-version}'
-          description: 'rapidjson version'
+          default: "{rapidjson-version}"
+          description: "rapidjson version"

       - string:
           name: OPENVSWITCH_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: OPENVSWITCH_VERSION
           # yamllint disable-line rule:line-length

-          default: '{openvswitch-version}'
-          description: 'openvswitch version'
+          default: "{openvswitch-version}"
+          description: "openvswitch version"

 
     scm:
       - gerrit-trigger-scm:
 
     scm:
       - gerrit-trigger-scm:

-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: ""
+          choosing-strategy: "default"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
       - gerrit-trigger-patch-merged:
 
     triggers:
       - gerrit-trigger-patch-merged:

-          gerrit-server-name: '{gerrit-server-name}'
-          name: 'opflex'
-          branch: '{branch}'
-          files: '**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          name: "opflex"
+          branch: "{branch}"
+          files: "**"
+          forbidden-files: ""

 
     builders:
       - opflex-build:
 
     builders:
       - opflex-build:

-          mvn33: 'mvn33'
-          stream: '{stream}'
+          mvn33: "mvn33"
+          stream: "{stream}"

 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[opflex]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[opflex]"

       - lf-infra-publish
       - lf-infra-publish

diff --git a/jjb/opflex/opflex-macros.yaml b/jjb/opflex/opflex-macros.yaml
index 1a8f6c06e18221813d1fe76d68181e0e309f7f97..1aa2ba6587d5b965a634a932403a1538f24dede4 100644 (file)
--- a/jjb/opflex/opflex-macros.yaml
+++ b/jjb/opflex/opflex-macros.yaml
@@ -5,23 +5,23 @@
     name: opflex-build
     builders:
       - maven-target:
     name: opflex-build
     builders:
       - maven-target:

-          maven-version: 'mvn33'
+          maven-version: "mvn33"

           pom: genie/pom.xml
           goals: compile
       - shell: !include-raw-escape: scripts/opflex-build.sh
 
 - builder:
           pom: genie/pom.xml
           goals: compile
       - shell: !include-raw-escape: scripts/opflex-build.sh
 
 - builder:

-    name: 'opflex-build-libuv'
+    name: "opflex-build-libuv"

     builders:
       - shell: !include-raw-escape: scripts/libuv-build.sh
 
 - builder:
     builders:
       - shell: !include-raw-escape: scripts/libuv-build.sh
 
 - builder:

-    name: 'opflex-build-openvswitch'
+    name: "opflex-build-openvswitch"

     builders:
       - shell: !include-raw: scripts/openvswitch-build.sh
 
 - builder:
     builders:
       - shell: !include-raw: scripts/openvswitch-build.sh
 
 - builder:

-    name: 'opflex-build-rapidjson'
+    name: "opflex-build-rapidjson"

     builders:
       - shell: !include-raw-escape: scripts/rapidjson-build.sh
 
     builders:
       - shell: !include-raw-escape: scripts/rapidjson-build.sh
 


@@ -37,16 +37,16 @@
     # UPLOAD_FILES_PATH: Path to directory containing one or more files
     builders:
       - lf-maven-install:
     # UPLOAD_FILES_PATH: Path to directory containing one or more files
     builders:
       - lf-maven-install:

-          mvn-version: '{mvn-version}'
+          mvn-version: "{mvn-version}"

       - lf-provide-maven-settings:
       - lf-provide-maven-settings:

-          global-settings-file: '{global-settings-file}'
-          settings-file: '{settings-file}'
+          global-settings-file: "{global-settings-file}"
+          settings-file: "{settings-file}"

       - inject:
           properties-content: |
       - inject:
           properties-content: |

-              MAVEN_REPO_URL=file://$WORKSPACE/m2repo
-              REPO_ID={repo-id}
-              GROUP_ID={group-id}
-              UPLOAD_FILES_PATH={upload-files-dir}
+            MAVEN_REPO_URL=file://$WORKSPACE/m2repo
+            REPO_ID={repo-id}
+            GROUP_ID={group-id}
+            UPLOAD_FILES_PATH={upload-files-dir}

       - shell: !include-raw-escape:
           - ../global-jjb/shell/common-variables.sh
           - scripts/deploy-opflex.sh
       - shell: !include-raw-escape:
           - ../global-jjb/shell/common-variables.sh
           - scripts/deploy-opflex.sh


@@ -64,39 +64,39 @@
     # STAGING_PROFILE_ID  : Staging profile id created on Nexus
     builders:
       - lf-provide-maven-settings:
     # STAGING_PROFILE_ID  : Staging profile id created on Nexus
     builders:
       - lf-provide-maven-settings:

-          global-settings-file: '{global-settings-file}'
-          settings-file: '{settings-file}'
+          global-settings-file: "{global-settings-file}"
+          settings-file: "{settings-file}"

       - lf-infra-create-netrc:
           server-id: opendaylight-staging
       - inject:
           properties-content: |
       - lf-infra-create-netrc:
           server-id: opendaylight-staging
       - inject:
           properties-content: |

-              STAGING_PROFILE_ID={staging-profile-id}
+            STAGING_PROFILE_ID={staging-profile-id}

       - shell: !include-raw-escape:
           - ../global-jjb/shell/maven-stage.sh
 
 - scm:
       - shell: !include-raw-escape:
           - ../global-jjb/shell/maven-stage.sh
 
 - scm:

-    name: 'git-opflex-libuv'
+    name: "git-opflex-libuv"

     scm:
       - git:
           url: https://github.com/libuv/libuv.git
           branches:
     scm:
       - git:
           url: https://github.com/libuv/libuv.git
           branches:

-            - 'refs/tags/v$LIBUV_VERSION'
+            - "refs/tags/v$LIBUV_VERSION"

           wipe-workspace: true
 
 - scm:
           wipe-workspace: true
 
 - scm:

-    name: 'git-opflex-ovs-v2'
+    name: "git-opflex-ovs-v2"

     scm:
       - git:
           url: https://github.com/openvswitch/ovs.git
           branches:
     scm:
       - git:
           url: https://github.com/openvswitch/ovs.git
           branches:

-            - 'refs/tags/v$OPENVSWITCH_VERSION'
+            - "refs/tags/v$OPENVSWITCH_VERSION"

           wipe-workspace: true
 
 - scm:
           wipe-workspace: true
 
 - scm:

-    name: 'git-opflex-rapidjson'
+    name: "git-opflex-rapidjson"

     scm:
       - git:
           url: https://github.com/miloyip/rapidjson.git
           branches:
     scm:
       - git:
           url: https://github.com/miloyip/rapidjson.git
           branches:

-            - 'refs/tags/v$RAPIDJSON_VERSION'
+            - "refs/tags/v$RAPIDJSON_VERSION"

           wipe-workspace: true
           wipe-workspace: true

diff --git a/jjb/opflex/opflex-thirdparty-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml
index 0a2f14d7fdb2d63e88793b3d138371565122957d..039edcb07c01b71ba13fdda0f226c25aee679e96 100644 (file)
--- a/jjb/opflex/opflex-thirdparty-dependencies.yaml
+++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml
@@ -2,192 +2,192 @@
 - project:
     name: opflex-dependencies
     jobs:
 - project:
     name: opflex-dependencies
     jobs:

-      - 'opflex-thirdparty-libuv-{stream}'
-      - 'opflex-thirdparty-rapidjson-{stream}'
-      - 'opflex-thirdparty-openvswitch-{stream}'
+      - "opflex-thirdparty-libuv-{stream}"
+      - "opflex-thirdparty-rapidjson-{stream}"
+      - "opflex-thirdparty-openvswitch-{stream}"

 
     stream:
       - oxygen:
 
     stream:
       - oxygen:

-          branch: 'master'
-          libuv-version: '1.20.2'
-          rapidjson-version: '1.1.0'
-          openvswitch-version: '2.12.0'
+          branch: "master"
+          libuv-version: "1.20.2"
+          rapidjson-version: "1.1.0"
+          openvswitch-version: "2.12.0"

           disable-job: true
 
           disable-job: true
 

-    project: 'opflex'
+    project: "opflex"

 
 

-    mvn-opts: ''
-    mvn-params: ''
+    mvn-opts: ""
+    mvn-params: ""

     mvn-version: mvn33
 
     # common parameters required for 'lf-infra-deploy-maven-file' builder
     mvn-version: mvn33
 
     # common parameters required for 'lf-infra-deploy-maven-file' builder

-    repo-id: 'thirdparty'
-    upload-files-dir: '$WORKSPACE/upload_files'
+    repo-id: "thirdparty"
+    upload-files-dir: "$WORKSPACE/upload_files"

 
 - job-template:
 
 - job-template:

-    name: 'opflex-thirdparty-libuv-{stream}'
+    name: "opflex-thirdparty-libuv-{stream}"

 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
 
 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
 

-    group-id: 'libuv'
+    group-id: "libuv"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
-          staging-profile-id: ''
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+          staging-profile-id: ""

       - string:
           name: LIBUV_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: LIBUV_VERSION
           # yamllint disable-line rule:line-length

-          default: '{libuv-version}'
-          description: 'libuv version'
+          default: "{libuv-version}"
+          description: "libuv version"

 
     scm:
       - git-opflex-libuv
 
     wrappers:
       - opendaylight-infra-wrappers:
 
     scm:
       - git-opflex-libuv
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - lf-infra-pre-build
       - opflex-build-libuv
       - lf-infra-deploy-maven-file:
 
     builders:
       - lf-infra-pre-build
       - opflex-build-libuv
       - lf-infra-deploy-maven-file:

-          global-settings-file: 'global-settings'
-          settings-file: 'opflex-settings'
-          mvn-version: '{mvn-version}'
-          repo-id: '{repo-id}'
-          group-id: '{group-id}'
-          upload-files-dir: '{upload-files-dir}'
-          maven-repo-url: '$NEXUS_URL/content/repositories/thirdparty'
+          global-settings-file: "global-settings"
+          settings-file: "opflex-settings"
+          mvn-version: "{mvn-version}"
+          repo-id: "{repo-id}"
+          group-id: "{group-id}"
+          upload-files-dir: "{upload-files-dir}"
+          maven-repo-url: "$NEXUS_URL/content/repositories/thirdparty"

 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[opflex]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[opflex]"

       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: 'opflex-thirdparty-rapidjson-{stream}'
+    name: "opflex-thirdparty-rapidjson-{stream}"

 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
 
 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
 

-    group-id: 'rapidjson'
+    group-id: "rapidjson"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
-          staging-profile-id: ''
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+          staging-profile-id: ""

       - string:
           name: RAPIDJSON_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: RAPIDJSON_VERSION
           # yamllint disable-line rule:line-length

-          default: '{rapidjson-version}'
-          description: 'rapidjson version'
+          default: "{rapidjson-version}"
+          description: "rapidjson version"

 
     scm:
       - git-opflex-rapidjson
 
     wrappers:
       - opendaylight-infra-wrappers:
 
     scm:
       - git-opflex-rapidjson
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - lf-infra-pre-build
       - opflex-build-rapidjson
       - lf-infra-deploy-maven-file:
 
     builders:
       - lf-infra-pre-build
       - opflex-build-rapidjson
       - lf-infra-deploy-maven-file:

-          global-settings-file: 'global-settings'
-          settings-file: 'opflex-settings'
-          mvn-version: '{mvn-version}'
-          repo-id: '{repo-id}'
-          group-id: '{group-id}'
-          upload-files-dir: '{upload-files-dir}'
-          maven-repo-url: '$NEXUS_URL/content/repositories/thirdparty'
+          global-settings-file: "global-settings"
+          settings-file: "opflex-settings"
+          mvn-version: "{mvn-version}"
+          repo-id: "{repo-id}"
+          group-id: "{group-id}"
+          upload-files-dir: "{upload-files-dir}"
+          maven-repo-url: "$NEXUS_URL/content/repositories/thirdparty"

 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[opflex]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[opflex]"

       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    name: 'opflex-thirdparty-openvswitch-{stream}'
+    name: "opflex-thirdparty-openvswitch-{stream}"

 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
 
 
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
 

-    group-id: 'openvswitch'
+    group-id: "openvswitch"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
-          staging-profile-id: ''
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+          staging-profile-id: ""

       - string:
           name: OPENVSWITCH_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: OPENVSWITCH_VERSION
           # yamllint disable-line rule:line-length

-          default: '{openvswitch-version}'
-          description: 'openvswitch-version'
+          default: "{openvswitch-version}"
+          description: "openvswitch-version"

 
     scm:
       - git-opflex-ovs-v2
 
     wrappers:
       - opendaylight-infra-wrappers:
 
     scm:
       - git-opflex-ovs-v2
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - lf-infra-pre-build
       - opflex-build-openvswitch
       - lf-infra-deploy-maven-file:
 
     builders:
       - lf-infra-pre-build
       - opflex-build-openvswitch
       - lf-infra-deploy-maven-file:

-          global-settings-file: 'global-settings'
-          settings-file: 'opflex-settings'
-          mvn-version: '{mvn-version}'
-          repo-id: '{repo-id}'
-          group-id: '{group-id}'
-          upload-files-dir: '{upload-files-dir}'
-          maven-repo-url: '$NEXUS_URL/content/repositories/thirdparty'
+          global-settings-file: "global-settings"
+          settings-file: "opflex-settings"
+          mvn-version: "{mvn-version}"
+          repo-id: "{repo-id}"
+          group-id: "{group-id}"
+          upload-files-dir: "{upload-files-dir}"
+          maven-repo-url: "$NEXUS_URL/content/repositories/thirdparty"

 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[opflex]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[opflex]"

       - lf-infra-publish
       - lf-infra-publish

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 47c1cae38714698e5ee3d1878f33924fda255fa7..8897ea969c664a3f8ead94704e59bae723e0df4e 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -2,39 +2,39 @@
 - project:
     name: opflex-release
     jobs:
 - project:
     name: opflex-release
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: opflex
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-opflex/52373/
           rtd-token: bf99281866a176904cf12861789deaf04d4b0c45
           build-node: centos7-builder-2c-2g
           project-pattern: opflex
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-opflex/52373/
           rtd-token: bf99281866a176904cf12861789deaf04d4b0c45

-      - 'opflex-release-{stream}'
+      - "opflex-release-{stream}"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          libuv-version: '1.20.2'
-          rapidjson-version: '1.1.0'
-          openvswitch-version: '2.12.0'
+          branch: "master"
+          libuv-version: "1.20.2"
+          rapidjson-version: "1.1.0"
+          openvswitch-version: "2.12.0"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          libuv-version: '1.20.2'
-          rapidjson-version: '1.1.0'
-          openvswitch-version: '2.12.0'
+          branch: "stable/aluminium"
+          libuv-version: "1.20.2"
+          rapidjson-version: "1.1.0"
+          openvswitch-version: "2.12.0"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          libuv-version: '1.20.2'
-          rapidjson-version: '1.1.0'
-          openvswitch-version: '2.12.0'
+          branch: "stable/magnesium"
+          libuv-version: "1.20.2"
+          rapidjson-version: "1.1.0"
+          openvswitch-version: "2.12.0"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
+          branch: "stable/sodium"
+          libuv-version: "1.8.0"
+          rapidjson-version: "1.0.2"
+          openvswitch-version: "2.6.0"

 
 

-    project: 'opflex'
-    project-name: 'opflex'
+    project: "opflex"
+    project-name: "opflex"

 
 

-    jdk: 'openjdk8'
+    jdk: "openjdk8"

 
     branch: master
     build-timeout: 60
 
     branch: master
     build-timeout: 60


@@ -47,11 +47,11 @@
     staging-profile-id: 906b0d53d714e
 
 - job-template:
     staging-profile-id: 906b0d53d714e
 
 - job-template:

-    name: 'opflex-release-{stream}'
+    name: "opflex-release-{stream}"

 
     node: centos7-builder-2c-8g
 
     node: centos7-builder-2c-8g

-    jdk: '{java-version}'
-    disabled: '{disable-job}'
+    jdk: "{java-version}"
+    disabled: "{disable-job}"

 
     ######################
     # Default parameters #
 
     ######################
     # Default parameters #


@@ -60,78 +60,78 @@
     disable-job: false
     build-timeout: 30
     java-version: openjdk8
     disable-job: false
     build-timeout: 30
     java-version: openjdk8

-    mvn-opts: ''
-    mvn-params: ''
+    mvn-opts: ""
+    mvn-params: ""

     mvn-version: mvn33
     stream: master
 
     properties:
       - opendaylight-infra-properties:
     mvn-version: mvn33
     stream: master
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: ''
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: ""

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
-          staging-profile-id: '{staging-profile-id}'
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+          staging-profile-id: "{staging-profile-id}"

       - string:
           name: LIBUV_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: LIBUV_VERSION
           # yamllint disable-line rule:line-length

-          default: '{libuv-version}'
-          description: 'libuv version to pull from thirdparty repository'
+          default: "{libuv-version}"
+          description: "libuv version to pull from thirdparty repository"

       - string:
           name: RAPIDJSON_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: RAPIDJSON_VERSION
           # yamllint disable-line rule:line-length

-          default: '{rapidjson-version}'
-          description: 'rapidjson version to pull from thirdparty repository'
+          default: "{rapidjson-version}"
+          description: "rapidjson version to pull from thirdparty repository"

       - string:
           name: OPENVSWITCH_VERSION
           # yamllint disable-line rule:line-length
       - string:
           name: OPENVSWITCH_VERSION
           # yamllint disable-line rule:line-length

-          default: '{openvswitch-version}'
-          description: 'openvswitch version to pull from thirdparty repository'
+          default: "{openvswitch-version}"
+          description: "openvswitch version to pull from thirdparty repository"

 
     scm:
       - gerrit-trigger-scm:
 
     scm:
       - gerrit-trigger-scm:

-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: ""
+          choosing-strategy: "default"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - lf-infra-pre-build
       - opflex-build:
 
     builders:
       - lf-infra-pre-build
       - opflex-build:

-          mvn33: '{mvn-version}'
-          stream: '{stream}'
+          mvn33: "{mvn-version}"
+          stream: "{stream}"

       # todo: replace the builder with generic version in global-jjb
       - opflex-deploy-maven-file:
       # todo: replace the builder with generic version in global-jjb
       - opflex-deploy-maven-file:

-          global-settings-file: '{global-settings-file}'
-          settings-file: '{settings-file}'
-          mvn-version: '{mvn-version}'
-          repo-id: '{staging-profile-id}'
-          group-id: '{group-id}'
-          upload-files-dir: '{upload-files-dir}'
+          global-settings-file: "{global-settings-file}"
+          settings-file: "{settings-file}"
+          mvn-version: "{mvn-version}"
+          repo-id: "{staging-profile-id}"
+          group-id: "{group-id}"
+          upload-files-dir: "{upload-files-dir}"

       - lf-infra-create-netrc:
           server-id: opendaylight-staging
       # todo: replace the builder with generic version in global-jjb
       - opflex-maven-stage:
       - lf-infra-create-netrc:
           server-id: opendaylight-staging
       # todo: replace the builder with generic version in global-jjb
       - opflex-maven-stage:

-          global-settings-file: '{global-settings-file}'
-          settings-file: '{settings-file}'
-          staging-profile-id: '{staging-profile-id}'
+          global-settings-file: "{global-settings-file}"
+          settings-file: "{settings-file}"
+          staging-profile-id: "{staging-profile-id}"

       - lf-provide-maven-settings-cleanup
 
     publishers:
       - email-notification:
       - lf-provide-maven-settings-cleanup
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[opflex]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[opflex]"

       - lf-infra-publish
 
 - project:
       - lf-infra-publish
 
 - project:

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 7c9348a6812a86c323380f4941497a179ba43d29..6c0650931e9d6b307845e9d01b71b8bc7fea9a4c 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -5,33 +5,33 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'ovsdb'
+    project: "ovsdb"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:

-      - 'upstream-clustering'
-      - 'gate-clustering'
+      - "upstream-clustering"
+      - "gate-clustering"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-ovsdb-southbound-impl-rest'
+    install-features: "odl-ovsdb-southbound-impl-rest"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 2ffcb9a0738a512309882daf31f8215d2718e98c..79413cd4cdd99e651e31907d9d9bc528615e7e76 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -5,36 +5,36 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'ovsdb'
+    project: "ovsdb"

 
     # The functionality under test
     functionality:
 
     # The functionality under test
     functionality:

-      - 'upstream-southbound'
-      - 'gate-southbound'
+      - "upstream-southbound"
+      - "gate-southbound"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Mininet configuration
     tools_system_count: 2
 
     # Features to install
 
     # Mininet configuration
     tools_system_count: 2
 
     # Features to install

-    install-features: 'odl-ovsdb-southbound-impl-rest'
+    install-features: "odl-ovsdb-southbound-impl-rest"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index cc641eda9b3d5a59cd830dd6a6fa3213e4f405ba..e0b58d5a35a486b29647f96bc1a19f2deda92aa1 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -2,73 +2,73 @@
 - project:
     name: ovsdb-full-integration
     jobs:
 - project:
     name: ovsdb-full-integration
     jobs:

-      - 'ovsdb-daily-full-integration-{stream}'
+      - "ovsdb-daily-full-integration-{stream}"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    project: 'ovsdb'
-    archive-artifacts: '*.log'
+    project: "ovsdb"
+    archive-artifacts: "*.log"

 
 - builder:
     name: ovsdb-run-it
     builders:
       - maven-target:
 
 - builder:
     name: ovsdb-run-it
     builders:
       - maven-target:

-          maven-version: '{maven-version}'
-          pom: '{pomFile}'
+          maven-version: "{maven-version}"
+          pom: "{pomFile}"

           goals: >
           goals: >

-              -V -B verify -l {logfile} -Pintegrationtest
-              -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true
-              -Dovsdb.controller.address=${{CONTROLLER_IP}}
+            -V -B verify -l {logfile} -Pintegrationtest
+            -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true
+            -Dovsdb.controller.address=${{CONTROLLER_IP}}

           properties:
           properties:

-            - 'ovsdbserver.ipaddress=127.0.0.1'
-            - 'ovsdbserver.port=6641'
-            - 'ovsdb.userspace.enabled=yes'
-            - 'maven.repo.local=/tmp/r'
-            - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            - 'stream={stream}'
+            - "ovsdbserver.ipaddress=127.0.0.1"
+            - "ovsdbserver.port=6641"
+            - "ovsdb.userspace.enabled=yes"
+            - "maven.repo.local=/tmp/r"
+            - "org.ops4j.pax.url.mvn.localRepository=/tmp/r"
+            - "stream={stream}"

           java-opts:
           java-opts:

-            - '-Xmx1024m'
-          settings: 'ovsdb-settings'
+            - "-Xmx1024m"
+          settings: "ovsdb-settings"

           settings-type: cfp
           settings-type: cfp

-          global-settings: 'global-settings'
+          global-settings: "global-settings"

           global-settings-type: cfp
 
 - builder:
     name: run-library-it
     builders:
       - ovsdb-run-it:
           global-settings-type: cfp
 
 - builder:
     name: run-library-it
     builders:
       - ovsdb-run-it:

-          maven-version: '{maven-version}'
-          stream: '{stream}'
-          pomFile: 'library/it/pom.xml'
-          logfile: '{OVS_VERSION}-libraryIT.log'
+          maven-version: "{maven-version}"
+          stream: "{stream}"
+          pomFile: "library/it/pom.xml"
+          logfile: "{OVS_VERSION}-libraryIT.log"

 
 - builder:
     name: run-southbound-it
     builders:
       - ovsdb-run-it:
 
 - builder:
     name: run-southbound-it
     builders:
       - ovsdb-run-it:

-          maven-version: '{maven-version}'
-          stream: '{stream}'
-          pomFile: 'southbound/southbound-it/pom.xml'
-          logfile: '{OVS_VERSION}-southboundIT.log'
+          maven-version: "{maven-version}"
+          stream: "{stream}"
+          pomFile: "southbound/southbound-it/pom.xml"
+          logfile: "{OVS_VERSION}-southboundIT.log"

 
 - builder:
     name: run-hwvtepsouthbound-it
     builders:
       - ovsdb-run-it:
 
 - builder:
     name: run-hwvtepsouthbound-it
     builders:
       - ovsdb-run-it:

-          maven-version: '{maven-version}'
-          stream: '{stream}'
-          pomFile: 'hwvtepsouthbound/hwvtepsouthbound-it/pom.xml'
-          logfile: '{OVS_VERSION}-hwvtepsouthboundIT.log'
+          maven-version: "{maven-version}"
+          stream: "{stream}"
+          pomFile: "hwvtepsouthbound/hwvtepsouthbound-it/pom.xml"
+          logfile: "{OVS_VERSION}-hwvtepsouthboundIT.log"

 
 - builder:
     name: run-ovsdb-it
 
 - builder:
     name: run-ovsdb-it


@@ -79,68 +79,68 @@
       - inject:
           properties-file: env.properties
       - run-southbound-it:
       - inject:
           properties-file: env.properties
       - run-southbound-it:

-          OVS_VERSION: '{OVS_VERSION}'
-          maven-version: '{maven-version}'
-          stream: '{stream}'
+          OVS_VERSION: "{OVS_VERSION}"
+          maven-version: "{maven-version}"
+          stream: "{stream}"

       - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
       - run-library-it:
       - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
       - run-library-it:

-          OVS_VERSION: '{OVS_VERSION}'
-          maven-version: '{maven-version}'
-          stream: '{stream}'
+          OVS_VERSION: "{OVS_VERSION}"
+          maven-version: "{maven-version}"
+          stream: "{stream}"

       - run-hwvtepsouthbound-it:
       - run-hwvtepsouthbound-it:

-          OVS_VERSION: '{OVS_VERSION}'
-          maven-version: '{maven-version}'
-          stream: '{stream}'
+          OVS_VERSION: "{OVS_VERSION}"
+          maven-version: "{maven-version}"
+          stream: "{stream}"

       - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:
       - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:

-    name: 'ovsdb-daily-full-integration-{stream}'
+    name: "ovsdb-daily-full-integration-{stream}"

 
     disable-job: false
 
     project-type: freestyle
     node: centos7-docker-1c-4g
 
     disable-job: false
 
     project-type: freestyle
     node: centos7-docker-1c-4g

-    jdk: '{java-version}'
+    jdk: "{java-version}"

     description: >
     description: >

-        Integration tests for the OVSDB project against different versions of
-        OVS and branches. This job runs nightly.
-    disabled: '{disable-job}'
+      Integration tests for the OVSDB project against different versions of
+      OVS and branches. This job runs nightly.
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - gerrit-trigger-scm:
 
     scm:
       - gerrit-trigger-scm:

-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

           choosing-strategy: gerrit
 
     wrappers:
       - opendaylight-infra-wrappers:
           choosing-strategy: gerrit
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
 
     triggers:

-      - timed: '@midnight'
+      - timed: "@midnight"

       - gerrit:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - comment-added-contains-event:
           trigger-on:
             - comment-added-contains-event:

-                comment-contains-value: 'runit'
+                comment-contains-value: "runit"

           projects:
           projects:

-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"

               branches:
               branches:

-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"

           skip-vote:
             successful: true
             failed: true
           skip-vote:
             successful: true
             failed: true


@@ -150,31 +150,31 @@
     builders:
       - wipe-org-opendaylight-repo
       - maven-target:
     builders:
       - wipe-org-opendaylight-repo
       - maven-target:

-          maven-version: 'mvn33'
-          pom: 'pom.xml'
-          goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
+          maven-version: "mvn33"
+          pom: "pom.xml"
+          goals: "-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true"

           properties:
           properties:

-            - 'maven.repo.local=/tmp/r'
-            - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            - 'stream={stream}'
+            - "maven.repo.local=/tmp/r"
+            - "org.ops4j.pax.url.mvn.localRepository=/tmp/r"
+            - "stream={stream}"

           java-opts:
           java-opts:

-            - '-Xmx1024m'
-          settings: 'ovsdb-settings'
+            - "-Xmx1024m"
+          settings: "ovsdb-settings"

           settings-type: cfp
           settings-type: cfp

-          global-settings: 'global-settings'
+          global-settings: "global-settings"

           global-settings-type: cfp
       - run-ovsdb-it:
           global-settings-type: cfp
       - run-ovsdb-it:

-          maven-version: 'mvn33'
-          stream: '{stream}'
-          OVS_VERSION: '2.4.0'
+          maven-version: "mvn33"
+          stream: "{stream}"
+          OVS_VERSION: "2.4.0"

       - run-ovsdb-it:
       - run-ovsdb-it:

-          maven-version: 'mvn33'
-          stream: '{stream}'
-          OVS_VERSION: '2.5.0'
+          maven-version: "mvn33"
+          stream: "{stream}"
+          OVS_VERSION: "2.5.0"

       - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:
       - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[ovsdb]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[ovsdb]"

       - lf-infra-publish
       - lf-infra-publish

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index eb487d560262064f9f2a71709eae8d8fdd0c3416..de9fba5ac2ead7d759bba0e4fc3bc652241e1ed5 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -5,38 +5,38 @@
       - inttest-patch-test
 
     # The project name
       - inttest-patch-test
 
     # The project name

-    project: 'ovsdb'
+    project: "ovsdb"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
-    jdk: 'openjdk8'
+    os-branch: "queens"
+    jdk: "openjdk8"

 
     feature:
       - genius:
           csit-list: >
 
     feature:
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

       - netvirt:
           csit-list: >
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

       - cluster-netvirt:
           csit-list: >
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

       - l2gw:
           csit-list: >
       - l2gw:
           csit-list: >

-              netvirt-csit-hwvtep-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-hwvtep-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

       - core:
           csit-list: >
       - core:
           csit-list: >

-              ovsdb-csit-1node-gate-southbound-all-{stream},
-              ovsdb-csit-3node-gate-clustering-only-{stream}
+            ovsdb-csit-1node-gate-southbound-all-{stream},
+            ovsdb-csit-3node-gate-clustering-only-{stream}

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index a223c54200656cf06cb2febafb5981efff9fd0ae..e7fe9d2e64219442691e753f0d0dd85ba9cf7680 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -2,17 +2,17 @@
 - project:
     name: ovsdb-sonar
     jobs:
 - project:
     name: ovsdb-sonar
     jobs:

-      - 'ovsdb-sonar'
+      - "ovsdb-sonar"

 
 

-    project: 'ovsdb'
-    jdk: 'openjdk8'
+    project: "ovsdb"
+    jdk: "openjdk8"

 
 - job-template:
 
 - job-template:

-    name: 'ovsdb-sonar'
+    name: "ovsdb-sonar"

 
     project-type: freestyle
     node: centos7-docker-1c-4g
 
     project-type: freestyle
     node: centos7-docker-1c-4g

-    jdk: '{java-version}'
+    jdk: "{java-version}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:


@@ -20,34 +20,34 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - git-scm:
 
     scm:
       - git-scm:

-          refspec: ''
-          branch: 'master'
+          refspec: ""
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
 
     triggers:

-      - timed: '{schedule-saturday}'
+      - timed: "{schedule-saturday}"

       - gerrit:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - comment-added-contains-event:
           trigger-on:
             - comment-added-contains-event:

-                comment-contains-value: 'run-sonar$'
+                comment-contains-value: "run-sonar$"

           projects:
           projects:

-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"

               branches:
               branches:

-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/master"

           skip-vote:
             successful: true
             failed: true
           skip-vote:
             successful: true
             failed: true


@@ -60,55 +60,55 @@
           properties-file: env.properties
       - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
       - maven-target:
           properties-file: env.properties
       - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
       - maven-target:

-          maven-version: 'mvn35'
-          pom: 'pom.xml'
+          maven-version: "mvn35"
+          pom: "pom.xml"

           goals: >
           goals: >

-              clean install dependency:tree -V -B -Dsonar
-              -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true
-              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+            clean install dependency:tree -V -B -Dsonar
+            -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true
+            -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r

           java-opts:
           java-opts:

-            - '-Xmx1024m'
-          settings: 'ovsdb-settings'
+            - "-Xmx1024m"
+          settings: "ovsdb-settings"

           settings-type: cfp
           settings-type: cfp

-          global-settings: 'global-settings'
+          global-settings: "global-settings"

           global-settings-type: cfp
       - inject:
           properties-file: env.properties
       - maven-target:
           global-settings-type: cfp
       - inject:
           properties-file: env.properties
       - maven-target:

-          maven-version: 'mvn35'
-          pom: 'pom.xml'
+          maven-version: "mvn35"
+          pom: "pom.xml"

           goals: >
           goals: >

-              verify -V -B -Pintegrationtest -Dsonar
-              -Dskip.karaf.featureTest=true
-              -Dovsdb.controller.address=${{CONTROLLER_IP}}
-              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+            verify -V -B -Pintegrationtest -Dsonar
+            -Dskip.karaf.featureTest=true
+            -Dovsdb.controller.address=${{CONTROLLER_IP}}
+            -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r

           properties:
           properties:

-            - 'ovsdbserver.ipaddress=127.0.0.1'
-            - 'ovsdbserver.port=6641'
-            - 'ovsdb.userspace.enabled=yes'
-          settings: 'ovsdb-settings'
+            - "ovsdbserver.ipaddress=127.0.0.1"
+            - "ovsdbserver.port=6641"
+            - "ovsdb.userspace.enabled=yes"
+          settings: "ovsdb-settings"

           settings-type: cfp
           settings-type: cfp

-          global-settings: 'global-settings'
+          global-settings: "global-settings"

           global-settings-type: cfp
       - maven-target:
           global-settings-type: cfp
       - maven-target:

-          maven-version: 'mvn35'
+          maven-version: "mvn35"

           # We should switch to the recommended configuration of sonar once
           # JJB adds support for configurating the Sonar wrapper:
           #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
           goals: >
           # We should switch to the recommended configuration of sonar once
           # JJB adds support for configurating the Sonar wrapper:
           #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
           goals: >

-              sonar:sonar -V -B -Djenkins -Dsonar
-              -Dsonar.host.url=https://sonar.opendaylight.org
-              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          settings: 'ovsdb-settings'
+            sonar:sonar -V -B -Djenkins -Dsonar
+            -Dsonar.host.url=https://sonar.opendaylight.org
+            -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          settings: "ovsdb-settings"

           settings-type: cfp
           settings-type: cfp

-          global-settings: 'global-settings'
+          global-settings: "global-settings"

           global-settings-type: cfp
       - shell: !include-raw-escape: cleanup-docker.sh
       - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:
           global-settings-type: cfp
       - shell: !include-raw-escape: cleanup-docker.sh
       - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[ovsdb]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[ovsdb]"

       - lf-jacoco-report
       - lf-infra-publish
       - lf-jacoco-report
       - lf-infra-publish

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 02f8c80178c4d8ebc141d6d97a5fd8ba18af36a7..47303e56d7415b59190a0cf9756c2d532a77a225 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -2,9 +2,9 @@
 - project:
     name: ovsdb-silicon
     jobs:
 - project:
     name: ovsdb-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/


@@ -12,19 +12,19 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: silicon
     block_on_csit: false
 
     stream: silicon

-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'master'
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "master"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    java-version: "openjdk11"
+    mvn-settings: "ovsdb-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a68b188166958
 
     # Used by the release job
     staging-profile-id: a68b188166958


@@ -32,9 +32,9 @@
 - project:
     name: ovsdb-aluminium
     jobs:
 - project:
     name: ovsdb-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/


@@ -42,19 +42,19 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: aluminium
     block_on_csit: false
 
     stream: aluminium

-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/aluminium'
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "stable/aluminium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    java-version: "openjdk11"
+    mvn-settings: "ovsdb-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a68b188166958
 
     # Used by the release job
     staging-profile-id: a68b188166958


@@ -62,9 +62,9 @@
 - project:
     name: ovsdb-magnesium
     jobs:
 - project:
     name: ovsdb-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/


@@ -72,19 +72,19 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: magnesium
     block_on_csit: false
 
     stream: magnesium

-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/magnesium'
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "stable/magnesium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    java-version: 'openjdk11'
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    java-version: "openjdk11"
+    mvn-settings: "ovsdb-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a68b188166958
 
     # Used by the release job
     staging-profile-id: a68b188166958


@@ -92,9 +92,9 @@
 - project:
     name: ovsdb-sodium
     jobs:
 - project:
     name: ovsdb-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/


@@ -102,18 +102,18 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"

     block_on_csit: false
 
     stream: sodium
     block_on_csit: false
 
     stream: sodium

-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/sodium'
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "stable/sodium"

     build-node: centos7-builder-2c-8g
     build-node: centos7-builder-2c-8g

-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    mvn-settings: "ovsdb-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a68b188166958
 
     # Used by the release job
     staging-profile-id: a68b188166958

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 3c3f50a80563fd856577287590b1c175c7faf8da..2ba703392914c3d70a557052f1e82951add13101 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -2,18 +2,18 @@
 - project:
     name: p4plugin-silicon
     jobs:
 - project:
     name: p4plugin-silicon
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'p4plugin'
-    project-name: 'p4plugin'
-    branch: 'master'
-    mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[p4plugin]'
+    project: "p4plugin"
+    project-name: "p4plugin"
+    branch: "master"
+    mvn-settings: "p4plugin-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[p4plugin]"

 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4


@@ -21,18 +21,18 @@
 - project:
     name: p4plugin-aluminium
     jobs:
 - project:
     name: p4plugin-aluminium
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'p4plugin'
-    project-name: 'p4plugin'
-    branch: 'stable/aluminium'
-    mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[p4plugin]'
+    project: "p4plugin"
+    project-name: "p4plugin"
+    branch: "stable/aluminium"
+    mvn-settings: "p4plugin-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[p4plugin]"

 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4


@@ -40,18 +40,18 @@
 - project:
     name: p4plugin-magnesium
     jobs:
 - project:
     name: p4plugin-magnesium
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'p4plugin'
-    project-name: 'p4plugin'
-    branch: 'stable/magnesium'
-    mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[p4plugin]'
+    project: "p4plugin"
+    project-name: "p4plugin"
+    branch: "stable/magnesium"
+    mvn-settings: "p4plugin-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[p4plugin]"

 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4


@@ -59,18 +59,18 @@
 - project:
     name: p4plugin-sodium
     jobs:
 - project:
     name: p4plugin-sodium
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'p4plugin'
-    project-name: 'p4plugin'
-    branch: 'stable/sodium'
-    mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[p4plugin]'
+    project: "p4plugin"
+    project-name: "p4plugin"
+    branch: "stable/sodium"
+    mvn-settings: "p4plugin-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[p4plugin]"

 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4


@@ -91,15 +91,15 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'p4plugin'
-    project-name: 'p4plugin'
-    branch: 'master'
-    mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "p4plugin"
+    project-name: "p4plugin"
+    branch: "master"
+    mvn-settings: "p4plugin-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: p4plugin-info
 
 - project:
     name: p4plugin-info

diff --git a/jjb/packaging/packaging-ansible.yaml b/jjb/packaging/packaging-ansible.yaml
index 329ec906d9f9618c05f1c3c69be3c5a832b41d76..9d48228b5c97dbb99eb55bc84a0749cb286ea297 100644 (file)
--- a/jjb/packaging/packaging-ansible.yaml
+++ b/jjb/packaging/packaging-ansible.yaml
@@ -4,26 +4,26 @@
     project-name: packaging-ansible
 
     jobs:
     project-name: packaging-ansible
 
     jobs:

-      - '{project-name}-test-rpm-{stream}'
-      - '{project-name}-test-deb-{stream}':
+      - "{project-name}-test-rpm-{stream}"
+      - "{project-name}-test-deb-{stream}":

           disable-job: true
       - gerrit-tox-verify
 
           disable-job: true
       - gerrit-tox-verify
 

-    project: 'integration/packaging/ansible-opendaylight'
+    project: "integration/packaging/ansible-opendaylight"

 
     stream:
       - master:
 
     stream:
       - master:

-          branch: 'master'
+          branch: "master"

 
 - job-template:
 
 - job-template:

-    name: '{project-name}-test-rpm-{stream}'
+    name: "{project-name}-test-rpm-{stream}"

 
     node: centos7-builder-2c-2g
     disable-job: false
 
     project-type: freestyle
 
 
     node: centos7-builder-2c-2g
     disable-job: false
 
     project-type: freestyle
 

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:


@@ -31,21 +31,21 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: '{project-name}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          basedir: "{project-name}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - shell: !include-raw: setup-ansible-rpm.sh
 
     builders:
       - shell: !include-raw: setup-ansible-rpm.sh


@@ -54,27 +54,26 @@
       - shell: !include-raw: test-ansible-rpm-upgrade.sh
 
     triggers:
       - shell: !include-raw: test-ansible-rpm-upgrade.sh
 
     triggers:

-      - timed: '@weekly'
+      - timed: "@weekly"

       - gerrit-trigger-patch-submitted:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-          forbidden-files: ''
-
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
+          forbidden-files: ""

 
     publishers:
       - lf-infra-publish
 
 - job-template:
 
     publishers:
       - lf-infra-publish
 
 - job-template:

-    name: '{project-name}-test-deb-{stream}'
+    name: "{project-name}-test-deb-{stream}"

 
     node: ubuntu1604-mininet-ovs-25-1c-4g
     disable-job: false
 
     project-type: freestyle
 
 
     node: ubuntu1604-mininet-ovs-25-1c-4g
     disable-job: false
 
     project-type: freestyle
 

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:


@@ -82,21 +81,21 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: '{project-name}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          basedir: "{project-name}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - shell: !include-raw: setup-ansible-deb.sh
 
     builders:
       - shell: !include-raw: setup-ansible-deb.sh


@@ -104,13 +103,13 @@
       - shell: !include-raw: test-ansible-deb-custom-config.sh
 
     triggers:
       - shell: !include-raw: test-ansible-deb-custom-config.sh
 
     triggers:

-      - timed: '@weekly'
+      - timed: "@weekly"

       - gerrit-trigger-patch-submitted:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
+          forbidden-files: ""

 
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/packaging/packaging-macros.yaml b/jjb/packaging/packaging-macros.yaml
index ae1e2573bb509ca6015c8adadf2ca731a9104da9..a7b93d0db4031f64424eb69b42d913767418c2dd 100644 (file)
--- a/jjb/packaging/packaging-macros.yaml
+++ b/jjb/packaging/packaging-macros.yaml
@@ -73,7 +73,7 @@
     name: install-test-uninstall-rpm
     builders:
       - inject:
     name: install-test-uninstall-rpm
     builders:
       - inject:

-          properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm'
+          properties-content: "URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm"

       # Install deps needed interactive Karaf shell tests
       - shell: |
           # Install expect to interact with Karaf shell
       # Install deps needed interactive Karaf shell tests
       - shell: |
           # Install expect to interact with Karaf shell


@@ -97,7 +97,7 @@
     name: install-test-uninstall-deb
     builders:
       - inject:
     name: install-test-uninstall-deb
     builders:
       - inject:

-          properties-content: 'PACKAGE=$WORKSPACE/packaging/packages/deb/opendaylight/*.deb'
+          properties-content: "PACKAGE=$WORKSPACE/packaging/packages/deb/opendaylight/*.deb"

       # Install deps needed interactive Karaf shell tests
       - shell: |
           # Install expect to interact with Karaf shell
       # Install deps needed interactive Karaf shell tests
       - shell: |
           # Install expect to interact with Karaf shell

diff --git a/jjb/packaging/packaging-puppet.yaml b/jjb/packaging/packaging-puppet.yaml
index 3752bd0f819e2c1114bab67624483f8cba2fa264..fa197372dce3b9cf4fb760ea10c13b062cdc8eff 100644 (file)
--- a/jjb/packaging/packaging-puppet.yaml
+++ b/jjb/packaging/packaging-puppet.yaml
@@ -4,26 +4,26 @@
     project-name: packaging-puppet
 
     jobs:
     project-name: packaging-puppet
 
     jobs:

-      - '{project-name}-test-sanity-{stream}'
-      - '{project-name}-test-full-{stream}'
+      - "{project-name}-test-sanity-{stream}"
+      - "{project-name}-test-full-{stream}"

       - gerrit-tox-verify
 
       - gerrit-tox-verify
 

-    project: 'integration/packaging/puppet-opendaylight'
+    project: "integration/packaging/puppet-opendaylight"

 
     stream:
       - master:
 
     stream:
       - master:

-          branch: 'master'
+          branch: "master"

       - fluorine:
       - fluorine:

-          branch: 'stable/fluorine'
+          branch: "stable/fluorine"

 
 - job-template:
 
 - job-template:

-    name: '{project-name}-test-sanity-{stream}'
+    name: "{project-name}-test-sanity-{stream}"

 
     node: centos7-docker-1c-4g
     disable-job: false
 
     project-type: freestyle
 
     node: centos7-docker-1c-4g
     disable-job: false
 
     project-type: freestyle

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:


@@ -31,49 +31,49 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - string:
           name: TEST_SUITE
       - string:
           name: TEST_SUITE

-          default: 'sanity'
-          description: 'Set of tests to execute, Rakefile task'
+          default: "sanity"
+          description: "Set of tests to execute, Rakefile task"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: '{project-name}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          basedir: "{project-name}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - shell: !include-raw: test-puppet.sh
 
     triggers:
 
     builders:
       - shell: !include-raw: test-puppet.sh
 
     triggers:

-      - timed: '@monthly'
+      - timed: "@monthly"

       - gerrit-trigger-patch-submitted:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
+          forbidden-files: ""

 
     publishers:
       - lf-infra-publish
 
 - job-template:
 
     publishers:
       - lf-infra-publish
 
 - job-template:

-    name: '{project-name}-test-full-{stream}'
+    name: "{project-name}-test-full-{stream}"

 
     node: centos7-docker-1c-4g
     disable-job: false
 
     project-type: freestyle
 
     node: centos7-docker-1c-4g
     disable-job: false
 
     project-type: freestyle

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:


@@ -81,42 +81,42 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - string:
           name: TEST_SUITE
       - string:
           name: TEST_SUITE

-          default: 'acceptance_dock'
-          description: 'Set of tests to execute, Rakefile task'
+          default: "acceptance_dock"
+          description: "Set of tests to execute, Rakefile task"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: '{project-name}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
+          basedir: "{project-name}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - shell: !include-raw: test-puppet.sh
 
     triggers:
 
     builders:
       - shell: !include-raw: test-puppet.sh
 
     triggers:

-      - timed: '@weekly'
+      - timed: "@weekly"

       - gerrit:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - comment-added-contains-event:
           trigger-on:
             - comment-added-contains-event:

-                comment-contains-value: 'puppet-test-full'
+                comment-contains-value: "puppet-test-full"

           projects:
           projects:

-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"

               branches:
               branches:

-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"

 
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 72b2d6a912f63243e78427d31af5d99bf8a0855d..8a2f23ac586d71888b7ac6b4d828062f99dfad00 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -4,27 +4,27 @@
     project-name: packaging
 
     jobs:
     project-name: packaging
 
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: integration/packaging
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationpackaging/32928/
           rtd-token: 371d63c43ad99b0745bb7779e3488c5e255c1180
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: integration/packaging
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationpackaging/32928/
           rtd-token: 371d63c43ad99b0745bb7779e3488c5e255c1180

-      - 'packaging-build-rpm-{stream}'
-      - 'packaging-build-rpm-{distro}-snap-{stream}'
-      - 'packaging-build-deb-{stream}':
+      - "packaging-build-rpm-{stream}"
+      - "packaging-build-rpm-{distro}-snap-{stream}"
+      - "packaging-build-deb-{stream}":

           disable-job: true
           disable-job: true

-      - 'packaging-verify-full-rpm-master'
-      - 'packaging-verify-rpm-master'
-      - 'packaging-test-rpm-master'
-      - 'packaging-test-rpm-upgrade-master'
-      - 'packaging-test-deb-master':
+      - "packaging-verify-full-rpm-master"
+      - "packaging-verify-rpm-master"
+      - "packaging-test-rpm-master"
+      - "packaging-test-rpm-upgrade-master"
+      - "packaging-test-deb-master":

           disable-job: true
       - gerrit-tox-verify:
           branch: master
           stream: master
 
           disable-job: true
       - gerrit-tox-verify:
           branch: master
           stream: master
 

-    project: 'integration/packaging'
+    project: "integration/packaging"

 
     stream:
       - sodium
 
     stream:
       - sodium


@@ -32,25 +32,25 @@
     distro:
       - opensuse-42
       - epel-7
     distro:
       - opensuse-42
       - epel-7

-    branch: 'master'
+    branch: "master"

 
     # common parameters required for 'lf-infra-deploy-maven-file' builder
 
     # common parameters required for 'lf-infra-deploy-maven-file' builder

-    group-id: 'org.opendaylight.integration-packaging'
-    upload-files-dir: '$WORKSPACE/upload_files'
-    maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
+    group-id: "org.opendaylight.integration-packaging"
+    upload-files-dir: "$WORKSPACE/upload_files"
+    maven-repo-url: "$NEXUS_URL/content/repositories/$REPO_ID"

 
 - job-template:
 
 - job-template:

-    name: 'packaging-build-rpm-{stream}'
+    name: "packaging-build-rpm-{stream}"

 
     disable-job: false
 
     node: centos7-builder-2c-2g
 
     project-type: freestyle
 
     disable-job: false
 
     node: centos7-builder-2c-2g
 
     project-type: freestyle

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
 

-    mvn-opts: ''
-    mvn-params: ''
+    mvn-opts: ""
+    mvn-params: ""

     mvn-version: mvn33
 
     properties:
     mvn-version: mvn33
 
     properties:


@@ -59,76 +59,75 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
-          staging-profile-id: ''
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+          staging-profile-id: ""

       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length

-          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
-          description: 'URL to ODL tarball artifact to repackage into RPM'
+          default: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz"
+          description: "URL to ODL tarball artifact to repackage into RPM"

       - string:
           name: CHANGELOG_NAME
       - string:
           name: CHANGELOG_NAME

-          default: 'Jenkins'
-          description: 'Name of person who defined RPM'
+          default: "Jenkins"
+          description: "Name of person who defined RPM"

       - string:
           name: CHANGELOG_EMAIL
       - string:
           name: CHANGELOG_EMAIL

-          default: 'jenkins-donotreply@opendaylight.org'
-          description: 'Email of person who defined RPM'
+          default: "jenkins-donotreply@opendaylight.org"
+          description: "Email of person who defined RPM"

       - string:
           name: DEPLOY_TO_REPO
       - string:
           name: DEPLOY_TO_REPO

-          default: 'opendaylight-{stream}-epel-7-x86_64-devel'
-          description: 'Repository to deploy resulting package to'
+          default: "opendaylight-{stream}-epel-7-x86_64-devel"
+          description: "Repository to deploy resulting package to"

       - string:
           name: PKG_VERSION_OVERRIDE
       - string:
           name: PKG_VERSION_OVERRIDE

-          default: ''
-          description: 'Override autodetected package component of RPM version (maj.min.pat-pkg)'
+          default: ""
+          description: "Override autodetected package component of RPM version (maj.min.pat-pkg)"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "packaging"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - lf-infra-pre-build
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
       - lf-infra-deploy-maven-file:
 
     builders:
       - lf-infra-pre-build
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
       - lf-infra-deploy-maven-file:

-          global-settings-file: 'global-settings'
-          settings-file: 'packaging-settings'
-          mvn-version: '{mvn-version}'
-          repo-id: '$DEPLOY_TO_REPO'
-          group-id: '{group-id}'
-          upload-files-dir: '{upload-files-dir}'
-          maven-repo-url: '{maven-repo-url}'
+          global-settings-file: "global-settings"
+          settings-file: "packaging-settings"
+          mvn-version: "{mvn-version}"
+          repo-id: "$DEPLOY_TO_REPO"
+          group-id: "{group-id}"
+          upload-files-dir: "{upload-files-dir}"
+          maven-repo-url: "{maven-repo-url}"

 
     publishers:
       - lf-infra-publish
 
 
     publishers:
       - lf-infra-publish
 

-

 - job-template:
 - job-template:

-    name: 'packaging-build-rpm-{distro}-snap-{stream}'
+    name: "packaging-build-rpm-{distro}-snap-{stream}"

 
     node: centos7-docker-2c-2g
     disable-job: false
 
     project-type: freestyle
 
     node: centos7-docker-2c-2g
     disable-job: false
 
     project-type: freestyle

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
 

-    mvn-opts: ''
-    mvn-params: ''
+    mvn-opts: ""
+    mvn-params: ""

     mvn-version: mvn33
 
     properties:
     mvn-version: mvn33
 
     properties:


@@ -137,145 +136,143 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
-          staging-profile-id: ''
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+          staging-profile-id: ""

       - string:
           name: CHANGELOG_NAME
       - string:
           name: CHANGELOG_NAME

-          default: 'Jenkins'
-          description: 'Name of person who defined RPM'
+          default: "Jenkins"
+          description: "Name of person who defined RPM"

       - string:
           name: CHANGELOG_EMAIL
       - string:
           name: CHANGELOG_EMAIL

-          default: 'jenkins-donotreply@opendaylight.org'
-          description: 'Email of person who defined RPM'
+          default: "jenkins-donotreply@opendaylight.org"
+          description: "Email of person who defined RPM"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "packaging"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - lf-infra-pre-build
       - inject:
           properties-content: |
 
     builders:
       - lf-infra-pre-build
       - inject:
           properties-content: |

-              STREAM={stream}
-              DISTRO={distro}
+            STREAM={stream}
+            DISTRO={distro}

       - shell: !include-raw: build-rpm-snap-docker.sh
       - shell: !include-raw: test-rpm-docker.sh
       - lf-infra-deploy-maven-file:
       - shell: !include-raw: build-rpm-snap-docker.sh
       - shell: !include-raw: test-rpm-docker.sh
       - lf-infra-deploy-maven-file:

-          global-settings-file: 'global-settings'
-          settings-file: 'packaging-settings'
-          mvn-version: '{mvn-version}'
-          repo-id: 'opendaylight-{stream}-{distro}-x86_64-devel'
-          group-id: '{group-id}'
-          upload-files-dir: '{upload-files-dir}'
-          maven-repo-url: '{maven-repo-url}'
+          global-settings-file: "global-settings"
+          settings-file: "packaging-settings"
+          mvn-version: "{mvn-version}"
+          repo-id: "opendaylight-{stream}-{distro}-x86_64-devel"
+          group-id: "{group-id}"
+          upload-files-dir: "{upload-files-dir}"
+          maven-repo-url: "{maven-repo-url}"

 
     triggers:
 
     triggers:

-      - timed: '@daily'
+      - timed: "@daily"

 
     publishers:
       - lf-infra-publish
 
 
     publishers:
       - lf-infra-publish
 

-

 - job-template:
 - job-template:

-    name: 'packaging-verify-rpm-master'
+    name: "packaging-verify-rpm-master"

 
     node: centos7-builder-2c-2g
     disable-job: false
 
     project-type: freestyle
 
     node: centos7-builder-2c-2g
     disable-job: false
 
     project-type: freestyle

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "packaging"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       # Test Sodium ('Managed Release Common Distro') release tarball
       - inject:
           # yamllint disable-line rule:line-length
 
     builders:
       # Test Sodium ('Managed Release Common Distro') release tarball
       - inject:
           # yamllint disable-line rule:line-length

-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/opendaylight/0.11.0/opendaylight-0.11.0.tar.gz'
+          properties-content: "DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/opendaylight/0.11.0/opendaylight-0.11.0.tar.gz"

       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # Test latest Sodium snapshot
       - inject:
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # Test latest Sodium snapshot
       - inject:

-          properties-content: 'STREAM=sodium'
+          properties-content: "STREAM=sodium"

       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
     triggers:
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
     triggers:

-      - timed: '@weekly'
+      - timed: "@weekly"

       - gerrit-trigger-patch-submitted:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'packages/**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "packages/**"
+          forbidden-files: ""

 
     publishers:
       - lf-infra-publish
 
 
     publishers:
       - lf-infra-publish
 

-

 - job-template:
 - job-template:

-    name: 'packaging-verify-full-rpm-master'
+    name: "packaging-verify-full-rpm-master"

 
     node: centos7-builder-2c-2g
     disable-job: false
 
     project-type: freestyle
 
     node: centos7-builder-2c-2g
     disable-job: false
 
     project-type: freestyle

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "packaging"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       # Test Sodium release tarball
       - inject:
           # yamllint disable-line rule:line-length
 
     builders:
       # Test Sodium release tarball
       - inject:
           # yamllint disable-line rule:line-length

-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.11.0/karaf-0.11.0.tar.gz'
+          properties-content: "DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.11.0/karaf-0.11.0.tar.gz"

       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 


@@ -284,58 +281,57 @@
 
       # Test latest Sodium snapshot
       - inject:
 
       # Test latest Sodium snapshot
       - inject:

-          properties-content: 'STREAM=sodium'
+          properties-content: "STREAM=sodium"

       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
     triggers:
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
     triggers:

-      - timed: '@weekly'
+      - timed: "@weekly"

       - gerrit:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - comment-added-contains-event:
           trigger-on:
             - comment-added-contains-event:

-                comment-contains-value: 'verify-rpm-full'
+                comment-contains-value: "verify-rpm-full"

           projects:
             - project-compare-type: ANT
           projects:
             - project-compare-type: ANT

-              project-pattern: '{project}'
+              project-pattern: "{project}"

               branches:
                 - branch-compare-type: ANT
               branches:
                 - branch-compare-type: ANT

-                  branch-pattern: '**/{branch}'
+                  branch-pattern: "**/{branch}"

 
     publishers:
       - lf-infra-publish
 
 
     publishers:
       - lf-infra-publish
 

-

 - job-template:
 - job-template:

-    name: 'packaging-test-rpm-master'
+    name: "packaging-test-rpm-master"

 
     node: centos7-builder-2c-2g
     disable-job: false
 
 
     node: centos7-builder-2c-2g
     disable-job: false
 

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - string:
           name: URL
           # yamllint disable-line rule:line-length
       - string:
           name: URL
           # yamllint disable-line rule:line-length

-          default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-9-devel.repo'
-          description: 'Link to .repo or .rpm file'
+          default: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-9-devel.repo"
+          description: "Link to .repo or .rpm file"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "packaging"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - shell: |
 
     builders:
       - shell: |


@@ -352,45 +348,44 @@
       - shell: !include-raw: uninstall-rpm.sh
 
     triggers:
       - shell: !include-raw: uninstall-rpm.sh
 
     triggers:

-      - timed: '@monthly'
+      - timed: "@monthly"

 
     publishers:
       # TODO: Remove the archive publisher
       #       small data should be stored on logs.opendaylight.org
       #       large data should be stored on nexus.opendaylight.org
       - archive:
 
     publishers:
       # TODO: Remove the archive publisher
       #       small data should be stored on logs.opendaylight.org
       #       large data should be stored on nexus.opendaylight.org
       - archive:

-          artifacts: '**'
+          artifacts: "**"

           allow-empty: true
           fingerprint: true
           latest-only: true
       - lf-infra-publish
 
           allow-empty: true
           fingerprint: true
           latest-only: true
       - lf-infra-publish
 

-

 - job-template:
 - job-template:

-    name: 'packaging-test-rpm-upgrade-master'
+    name: "packaging-test-rpm-upgrade-master"

 
     disable-job: false
 
     node: centos7-builder-2c-2g
 
     disable-job: false
 
     node: centos7-builder-2c-2g

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "packaging"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       # Tests (current and future):
 
     builders:
       # Tests (current and future):


@@ -404,65 +399,64 @@
       # Test 1: Install latest release, stop/uninstall, install latest CD
       - inject:
           # yamllint disable-line rule:line-length
       # Test 1: Install latest release, stop/uninstall, install latest CD
       - inject:
           # yamllint disable-line rule:line-length

-          properties-content: 'URL=https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-90-release.repo'
+          properties-content: "URL=https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-90-release.repo"

       - install-start-test-stop-uninstall-rpm
       - inject:
           # yamllint disable-line rule:line-length
       - install-start-test-stop-uninstall-rpm
       - inject:
           # yamllint disable-line rule:line-length

-          properties-content: 'URL=https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-9-devel.repo'
+          properties-content: "URL=https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-9-devel.repo"

       - install-start-test-stop-uninstall-rpm
 
       # Test 2: Install latest release, stop, upgrade to latest CD
       - inject:
           # yamllint disable-line rule:line-length
       - install-start-test-stop-uninstall-rpm
 
       # Test 2: Install latest release, stop, upgrade to latest CD
       - inject:
           # yamllint disable-line rule:line-length

-          properties-content: 'URL=https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-90-release.repo'
+          properties-content: "URL=https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-90-release.repo"

       - install-start-test-stop-rpm
       - inject:
           # yamllint disable-line rule:line-length
       - install-start-test-stop-rpm
       - inject:
           # yamllint disable-line rule:line-length

-          properties-content: 'REPO_CFG_FILE_URL=https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-9-devel.repo'
+          properties-content: "REPO_CFG_FILE_URL=https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-9-devel.repo"

       - installrepcfg-upgrade-start-test-stop-rpm
 
     triggers:
       - installrepcfg-upgrade-start-test-stop-rpm
 
     triggers:

-      - timed: '@weekly'
+      - timed: "@weekly"

       - gerrit-trigger-patch-submitted:
       - gerrit-trigger-patch-submitted:

-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'packages/**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "packages/**"
+          forbidden-files: ""

 
     publishers:
       - lf-infra-publish
 
 
     publishers:
       - lf-infra-publish
 

-

 - job-template:
 - job-template:

-    name: 'packaging-test-deb-master'
+    name: "packaging-test-deb-master"

 
     node: ubuntu1604-mininet-ovs-25-1c-4g
     disable-job: false
 
 
     node: ubuntu1604-mininet-ovs-25-1c-4g
     disable-job: false
 

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - string:
           name: PACKAGE
       - string:
           name: PACKAGE

-          default: 'ppa:odl-team/oxygen'
-          description: 'Link to .deb package or name of PPA repo'
+          default: "ppa:odl-team/oxygen"
+          description: "Link to .deb package or name of PPA repo"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "packaging"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - shell: !include-raw-escape: install-deb.sh
 
     builders:
       - shell: !include-raw-escape: install-deb.sh


@@ -479,23 +473,22 @@
       - shell: !include-raw-escape: uninstall-deb.sh
 
     triggers:
       - shell: !include-raw-escape: uninstall-deb.sh
 
     triggers:

-      - timed: '@monthly'
+      - timed: "@monthly"

 
     publishers:
       - lf-infra-publish
 
 
     publishers:
       - lf-infra-publish
 

-

 - job-template:
 - job-template:

-    name: 'packaging-build-deb-{stream}'
+    name: "packaging-build-deb-{stream}"

 
     node: ubuntu1604-mininet-ovs-25-1c-4g
     disable-job: false
 
     project-type: freestyle
 
     node: ubuntu1604-mininet-ovs-25-1c-4g
     disable-job: false
 
     project-type: freestyle

-    disabled: '{disable-job}'
+    disabled: "{disable-job}"

 
 

-    mvn-opts: ''
-    mvn-params: ''
+    mvn-opts: ""
+    mvn-params: ""

     mvn-version: mvn33
 
     properties:
     mvn-version: mvn33
 
     properties:


@@ -504,60 +497,60 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - lf-infra-maven-parameters:
       - lf-infra-maven-parameters:

-          mvn-opts: '{mvn-opts}'
-          mvn-params: '{mvn-params}'
-          mvn-version: '{mvn-version}'
-          staging-profile-id: ''
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+          staging-profile-id: ""

       - string:
           name: DOWNLOAD_URL
           # FIXME: Update the default value to an active stream.
           # yamllint disable-line rule:line-length
       - string:
           name: DOWNLOAD_URL
           # FIXME: Update the default value to an active stream.
           # yamllint disable-line rule:line-length

-          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz'
-          description: 'URL to ODL tarball artifact to repackage into .deb'
+          default: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz"
+          description: "URL to ODL tarball artifact to repackage into .deb"

       - string:
           name: CHANGELOG_NAME
       - string:
           name: CHANGELOG_NAME

-          default: 'Jenkins'
-          description: 'Name of person who defined .deb'
+          default: "Jenkins"
+          description: "Name of person who defined .deb"

       - string:
           name: CHANGELOG_EMAIL
       - string:
           name: CHANGELOG_EMAIL

-          default: 'jenkins-donotreply@opendaylight.org'
-          description: 'Email of person who defined .deb'
+          default: "jenkins-donotreply@opendaylight.org"
+          description: "Email of person who defined .deb"

       - string:
           name: PKG_VERSION_OVERRIDE
       - string:
           name: PKG_VERSION_OVERRIDE

-          default: ''
-          description: 'Override autodetected package component of RPM version (maj.min.pat-pkg)'
+          default: ""
+          description: "Override autodetected package component of RPM version (maj.min.pat-pkg)"

 
     scm:
       - integration-gerrit-scm:
 
     scm:
       - integration-gerrit-scm:

-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
+          basedir: "packaging"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "master"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     builders:
       - lf-infra-pre-build
       - shell: !include-raw: build-deb.sh
       - install-test-uninstall-deb
       - lf-infra-deploy-maven-file:
 
     builders:
       - lf-infra-pre-build
       - shell: !include-raw: build-deb.sh
       - install-test-uninstall-deb
       - lf-infra-deploy-maven-file:

-          global-settings-file: 'global-settings'
-          settings-file: 'packaging-settings'
-          mvn-version: '{mvn-version}'
-          repo-id: 'opendaylight-{stream}-ubuntu-1604-x86_64-devel'
-          group-id: '{group-id}'
-          upload-files-dir: '{upload-files-dir}'
-          maven-repo-url: '{maven-repo-url}'
+          global-settings-file: "global-settings"
+          settings-file: "packaging-settings"
+          mvn-version: "{mvn-version}"
+          repo-id: "opendaylight-{stream}-ubuntu-1604-x86_64-devel"
+          group-id: "{group-id}"
+          upload-files-dir: "{upload-files-dir}"
+          maven-repo-url: "{maven-repo-url}"

 
     triggers:
 
     triggers:

-      - timed: '@monthly'
+      - timed: "@monthly"

 
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index f6e9aee3bd553f94be9c8a6d20d15b9520c37f35..d41cc10d5ca6a97b99452f6e13cc679f314bf2de 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -6,33 +6,33 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'packetcable'
+    project: "packetcable"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'pcmm'
+    functionality: "pcmm"

 
     disable-job: true
 
     # Project branches
     stream:
       - silicon:
 
     disable-job: true
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-packetcable-policy-server'
+    install-features: "odl-packetcable-policy-server"

     # Robot custom options
 
     # Robot custom options
 

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 5f1465b9d16e422472254c690b683d4420140f31..4bac2f7ef3036b1f2ed27a8732bdf15198d53b9a 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -6,13 +6,13 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'master'
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
+    project: "packetcable"
+    project-name: "packetcable"
+    branch: "master"
+    mvn-settings: "packetcable-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[packetcable]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -25,13 +25,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/aluminium'
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
+    project: "packetcable"
+    project-name: "packetcable"
+    branch: "stable/aluminium"
+    mvn-settings: "packetcable-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[packetcable]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -44,13 +44,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/magnesium'
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
+    project: "packetcable"
+    project-name: "packetcable"
+    branch: "stable/magnesium"
+    mvn-settings: "packetcable-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[packetcable]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -63,13 +63,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/sodium'
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
+    project: "packetcable"
+    project-name: "packetcable"
+    branch: "stable/sodium"
+    mvn-settings: "packetcable-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[packetcable]"

     disable-job: true
 
     # Used by the release job
     disable-job: true
 
     # Used by the release job


@@ -90,16 +90,16 @@
     name: packetcable-sonar
     jobs:
       - gerrit-maven-sonar
     name: packetcable-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'master'
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "packetcable"
+    project-name: "packetcable"
+    branch: "master"
+    mvn-settings: "packetcable-settings"
+    mvn-opts: "-Xmx1024m"

     disable-job: true
     sonarcloud: true
     disable-job: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: packetcable-info
 
 - project:
     name: packetcable-info

diff --git a/jjb/plastic/plastic.yaml b/jjb/plastic/plastic.yaml
index 597e4d5c451f38acfb505d54344a9ea8456808c1..f0a4f50fca1365f5312b8c538be76275f6f53d16 100644 (file)
--- a/jjb/plastic/plastic.yaml
+++ b/jjb/plastic/plastic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: plastic-master
     jobs:
 - project:
     name: plastic-master
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: plastic
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: plastic


@@ -18,7 +18,7 @@
     branch: master
     java-version: openjdk8
     mvn-settings: plastic-settings
     branch: master
     java-version: openjdk8
     mvn-settings: plastic-settings

-    mvn-opts: '-Xmx1024m'
+    mvn-opts: "-Xmx1024m"

 
     # Used by the release job
     staging-profile-id: 380d129f253e1
 
     # Used by the release job
     staging-profile-id: 380d129f253e1


@@ -47,11 +47,11 @@
     branch: master
     java-version: openjdk8
     mvn-settings: plastic-settings
     branch: master
     java-version: openjdk8
     mvn-settings: plastic-settings

-    mvn-opts: '-Xmx1024m'
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: plastic-info
 
 - project:
     name: plastic-info

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index a832fc1f1504b5bcf755be9eda9259c6d3e210e0..384f54b475f1eec3dbfba0948c16e4159e5b4523 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -2,7 +2,7 @@
 - project:
     name: builder-jobs
     jobs:
 - project:
     name: builder-jobs
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           project-pattern: releng/builder
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-releng-builder/32926/
           rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
           project-pattern: releng/builder
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-releng-builder/32926/
           rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e


@@ -27,12 +27,12 @@
 
     # The following values are only specified here
     # so that code blocks look similar to other projects.
 
     # The following values are only specified here
     # so that code blocks look similar to other projects.

-    project: 'releng/builder'
+    project: "releng/builder"

     project-name: builder
     stream: master
     branch: master
     build-node: centos7-builder-2c-2g
     project-name: builder
     stream: master
     branch: master
     build-node: centos7-builder-2c-2g

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

     build-timeout: 30
     jjb-version: 3.5.0
 
     build-timeout: 30
     jjb-version: 3.5.0
 


@@ -41,13 +41,13 @@
     jobs:
       - gerrit-openstack-cron
 
     jobs:
       - gerrit-openstack-cron
 

-    project: 'releng/builder'
+    project: "releng/builder"

     project-name: builder
     build-node: centos7-builder-2c-2g
 
     jenkins-urls: >
     project-name: builder
     build-node: centos7-builder-2c-2g
 
     jenkins-urls: >

-        https://jenkins.opendaylight.org/releng
-        https://jenkins.opendaylight.org/sandbox
+      https://jenkins.opendaylight.org/releng
+      https://jenkins.opendaylight.org/sandbox

     openstack-cloud: vex
 
 - job-template:
     openstack-cloud: vex
 
 - job-template:


@@ -62,26 +62,26 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
 
     triggers:

-      - timed: 'H H * * 1'
+      - timed: "H H * * 1"

 
     builders:
       - shell: !include-raw-escape: check-poms.sh
 
     publishers:
       - email-notification:
 
     builders:
       - shell: !include-raw-escape: check-poms.sh
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[releng]"

       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:


@@ -96,11 +96,11 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: ''
-          project: ''
-          branch: ''
-          refspec: ''
-          artifacts: ''
+          os-cloud: ""
+          project: ""
+          branch: ""
+          refspec: ""
+          artifacts: ""

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:


@@ -108,16 +108,16 @@
 
     triggers:
       - gerrit:
 
     triggers:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - comment-added-contains-event:
           trigger-on:
             - comment-added-contains-event:

-                comment-contains-value: 'copy-logs:'
+                comment-contains-value: "copy-logs:"

           projects:
             - project-compare-type: ANT
           projects:
             - project-compare-type: ANT

-              project-pattern: '**'
+              project-pattern: "**"

               branches:
                 - branch-compare-type: ANT
               branches:
                 - branch-compare-type: ANT

-                  branch-pattern: '**'
+                  branch-pattern: "**"

 
     builders:
       - shell: !include-raw-escape: copy-sandbox-logs.sh
 
     builders:
       - shell: !include-raw-escape: copy-sandbox-logs.sh


@@ -125,9 +125,8 @@
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish
 

-

 - job-template:
 - job-template:

-    name: 'builder-update-image-list'
+    name: "builder-update-image-list"

     project-type: freestyle
     node: centos7-builder-2c-1g
 
     project-type: freestyle
     node: centos7-builder-2c-1g
 


@@ -138,41 +137,41 @@
     parameters:
       - opendaylight-infra-parameters:
           os-cloud: vex
     parameters:
       - opendaylight-infra-parameters:
           os-cloud: vex

-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - git-scm:
 
     scm:
       - git-scm:

-          branch: '{branch}'
+          branch: "{branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
             - file-id: clouds-yaml
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
             - file-id: clouds-yaml

-              target: '$HOME/.config/openstack/clouds.yaml'
+              target: "$HOME/.config/openstack/clouds.yaml"

 
     triggers:
       # Update image list every Monday to Friday at 11:00 UTC
 
     triggers:
       # Update image list every Monday to Friday at 11:00 UTC

-      - timed: '0 11 * * 1-5'
+      - timed: "0 11 * * 1-5"

 
     builders:
       - lf-infra-pre-build
       - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
       - lf-infra-push-gerrit-patch:
 
     builders:
       - lf-infra-pre-build
       - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
       - lf-infra-push-gerrit-patch:

-          project: '{project}'
-          gerrit-user: 'jenkins-$SILO'
-          gerrit-host: 'git.opendaylight.org'
-          gerrit-topic: 'releng-update-cloud-image-list'
-          gerrit-commit-message: 'Update cloud image list docs'
-          reviewers-email: 'jluhrsen@gmail.com'
+          project: "{project}"
+          gerrit-user: "jenkins-$SILO"
+          gerrit-host: "git.opendaylight.org"
+          gerrit-topic: "releng-update-cloud-image-list"
+          gerrit-commit-message: "Update cloud image list docs"
+          reviewers-email: "jluhrsen@gmail.com"

 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[releng]"

       - lf-infra-publish
       - lf-infra-publish

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index f2d8ed89cb4ef4763fbc3c75a788da13b67f3f75..03c77cc76a4c32e78fd6129e5c4dce67ba425ad6 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -4,7 +4,7 @@
     name: opendaylight-infra-properties
     properties:
       - build-discarder:
     name: opendaylight-infra-properties
     properties:
       - build-discarder:

-          days-to-keep: '{build-days-to-keep}'
+          days-to-keep: "{build-days-to-keep}"

           num-to-keep: 40
           # Need to keep artifacts for at least 1 day as some projects need to
           # be able to validate their artifacts and only allowing limited
           num-to-keep: 40
           # Need to keep artifacts for at least 1 day as some projects need to
           # be able to validate their artifacts and only allowing limited


@@ -17,73 +17,73 @@
     parameters:
       - string:
           name: PROJECT
     parameters:
       - string:
           name: PROJECT

-          default: '{project}'
-          description: 'Parameter to identify an ODL Gerrit project'
+          default: "{project}"
+          description: "Parameter to identify an ODL Gerrit project"

       - string:
           name: ARCHIVE_ARTIFACTS
           # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
           default: >
       - string:
           name: ARCHIVE_ARTIFACTS
           # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
           default: >

-              {artifacts}
-              **/target/surefire-reports/*-output.txt
-              **/target/failsafe-reports/failsafe-summary.xml
-              **/hs_err_*.log
-              **/target/feature/feature.xml
+            {artifacts}
+            **/target/surefire-reports/*-output.txt
+            **/target/failsafe-reports/failsafe-summary.xml
+            **/hs_err_*.log
+            **/target/feature/feature.xml

           # TODO: **/*.hprof is too large, compress with xz first
           # TODO: **/*.hprof is too large, compress with xz first

-          description: 'Space separated glob patterns for artifacts to archive into logs.opendaylight.org'
+          description: "Space separated glob patterns for artifacts to archive into logs.opendaylight.org"

       - string:
           name: GERRIT_PROJECT
       - string:
           name: GERRIT_PROJECT

-          default: '{project}'
+          default: "{project}"

           description: "GERRIT_PROJECT parameter if not given by trigger"
       - string:
           name: GERRIT_BRANCH
           description: "GERRIT_PROJECT parameter if not given by trigger"
       - string:
           name: GERRIT_BRANCH

-          default: '{branch}'
+          default: "{branch}"

           description: "JJB configured GERRIT_BRANCH parameter"
       - string:
           name: GERRIT_REFSPEC
           description: "JJB configured GERRIT_BRANCH parameter"
       - string:
           name: GERRIT_REFSPEC

-          default: '{refspec}'
+          default: "{refspec}"

           description: |
           description: |

-              Gerrit reference to checkout (ex: refs/heads/master,
-              refs/changes/48/61548/1 where 61548 is Gerrit change ID, 1 is
-              patch number and 48 is last two digits of change ID)
+            Gerrit reference to checkout (ex: refs/heads/master,
+            refs/changes/48/61548/1 where 61548 is Gerrit change ID, 1 is
+            patch number and 48 is last two digits of change ID)

       - string:
           name: STACK_NAME
       - string:
           name: STACK_NAME

-          default: '$SILO-$JOB_NAME-$BUILD_NUMBER'
+          default: "$SILO-$JOB_NAME-$BUILD_NUMBER"

           description: "Used by Heat to generate a unique stack & vm name"
       - string:
           name: OS_CLOUD
           description: "Used by Heat to generate a unique stack & vm name"
       - string:
           name: OS_CLOUD

-          default: '{os-cloud}'
+          default: "{os-cloud}"

           description: |
           description: |

-              The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
-              variable name that is significant to openstack client as a
-              environment variable. Please refer to the documentation for
-              further details.
-              https://docs.openstack.org/developer/python-openstackclient/
+            The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
+            variable name that is significant to openstack client as a
+            environment variable. Please refer to the documentation for
+            further details.
+            https://docs.openstack.org/developer/python-openstackclient/

 
 - parameter:
     name: distribution-branch-to-build-parameter
     parameters:
       - string:
           name: DISTRIBUTION_BRANCH_TO_BUILD
 
 - parameter:
     name: distribution-branch-to-build-parameter
     parameters:
       - string:
           name: DISTRIBUTION_BRANCH_TO_BUILD

-          default: 'master'
-          description: 'distribution repo branch to build with'
+          default: "master"
+          description: "distribution repo branch to build with"

 
 - parameter:
     name: maven-exec
     parameters:
       - string:
           name: MVN
 
 - parameter:
     name: maven-exec
     parameters:
       - string:
           name: MVN

-          default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn'
-          description: 'Maven selector to be used by shell scripts'
+          default: "/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn"
+          description: "Maven selector to be used by shell scripts"

 
 - scm:
     name: git-scm
     scm:
       - git:
 
 - scm:
     name: git-scm
     scm:
       - git:

-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: ''
+          credentials-id: "opendaylight-jenkins-ssh"
+          url: "$GIT_BASE"
+          refspec: ""

           branches:
           branches:

-            - 'origin/{branch}'
+            - "origin/{branch}"

           skip-tag: true
           wipe-workspace: true
 
           skip-tag: true
           wipe-workspace: true
 


@@ -91,11 +91,11 @@
     name: git-scm-with-submodules
     scm:
       - git:
     name: git-scm-with-submodules
     scm:
       - git:

-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: ''
+          credentials-id: "opendaylight-jenkins-ssh"
+          url: "$GIT_BASE"
+          refspec: ""

           branches:
           branches:

-            - 'refs/heads/{branch}'
+            - "refs/heads/{branch}"

           skip-tag: true
           wipe-workspace: true
           submodule:
           skip-tag: true
           wipe-workspace: true
           submodule:


@@ -105,13 +105,13 @@
     name: gerrit-trigger-scm
     scm:
       - git:
     name: gerrit-trigger-scm
     scm:
       - git:

-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: '{refspec}'
+          credentials-id: "opendaylight-jenkins-ssh"
+          url: "$GIT_BASE"
+          refspec: "{refspec}"

           branches:
           branches:

-            - 'origin/$GERRIT_BRANCH'
+            - "origin/$GERRIT_BRANCH"

           skip-tag: true
           skip-tag: true

-          choosing-strategy: '{choosing-strategy}'
+          choosing-strategy: "{choosing-strategy}"

 
 # This is a single macro to use for all jobs who vote on every (relevant) patch set.
 # Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs,
 
 # This is a single macro to use for all jobs who vote on every (relevant) patch set.
 # Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs,


@@ -125,7 +125,7 @@
     name: gerrit-trigger-patch-submitted
     triggers:
       - gerrit:
     name: gerrit-trigger-patch-submitted
     triggers:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true


@@ -136,39 +136,39 @@
                 comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
           projects:
             - project-compare-type: ANT
                 comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
           projects:
             - project-compare-type: ANT

-              project-pattern: '{project}'
+              project-pattern: "{project}"

               branches:
                 - branch-compare-type: ANT
               branches:
                 - branch-compare-type: ANT

-                  branch-pattern: '**/{branch}'
+                  branch-pattern: "**/{branch}"

               file-paths:
                 - compare-type: ANT
               file-paths:
                 - compare-type: ANT

-                  pattern: '{files}'
+                  pattern: "{files}"

               forbidden-file-paths:
                 - compare-type: ANT
               forbidden-file-paths:
                 - compare-type: ANT

-                  pattern: '{forbidden-files}'
+                  pattern: "{forbidden-files}"

 
 # TODO: Unify argument names across gerrit-trigger-* macros.
 - trigger:
     name: gerrit-trigger-patch-merged
     triggers:
       - gerrit:
 
 # TODO: Unify argument names across gerrit-trigger-* macros.
 - trigger:
     name: gerrit-trigger-patch-merged
     triggers:
       - gerrit:

-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"

           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:

-                comment-contains-value: 'remerge$'
+                comment-contains-value: "remerge$"

           projects:
           projects:

-            - project-compare-type: 'ANT'
-              project-pattern: '{name}'
+            - project-compare-type: "ANT"
+              project-pattern: "{name}"

               branches:
               branches:

-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"

               file-paths:
                 - compare-type: ANT
               file-paths:
                 - compare-type: ANT

-                  pattern: '{files}'
+                  pattern: "{files}"

               forbidden-file-paths:
                 - compare-type: ANT
               forbidden-file-paths:
                 - compare-type: ANT

-                  pattern: '{forbidden-files}'
+                  pattern: "{forbidden-files}"

           skip-vote:
             successful: true
             failed: true
           skip-vote:
             successful: true
             failed: true


@@ -192,21 +192,21 @@
     name: email-notification
     publishers:
       - email-ext:
     name: email-notification
     publishers:
       - email-ext:

-          recipients: '{email-recipients}'
-          reply-to: ''
+          recipients: "{email-recipients}"
+          reply-to: ""

           content-type: default
           content-type: default

-          subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
+          subject: "{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!"

           body: |
           body: |

-              $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:
+            $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:

 
 

-              Please refer to the logs server URL for console logs when possible
-              and use the Jenkins Build URL as a last resort.
+            Please refer to the logs server URL for console logs when possible
+            and use the Jenkins Build URL as a last resort.

 
 

-              Console Logs URL:
-              https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
+            Console Logs URL:
+            https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER

 
 

-              Jenkins Build URL:
-              $BUILD_URL
+            Jenkins Build URL:
+            $BUILD_URL

           unstable: true
           fixed: true
           send-to:
           unstable: true
           fixed: true
           send-to:


@@ -243,12 +243,12 @@
 - builder:
     name: wipe-org-opendaylight-repo
     builders:
 - builder:
     name: wipe-org-opendaylight-repo
     builders:

-      - shell: 'if [ -d /tmp/r/org/opendaylight ]; then rm -rf /tmp/r/org/opendaylight; fi'
+      - shell: "if [ -d /tmp/r/org/opendaylight ]; then rm -rf /tmp/r/org/opendaylight; fi"

 
 - builder:
     name: wipe-local-maven-repo
     builders:
 
 - builder:
     name: wipe-local-maven-repo
     builders:

-      - shell: 'if [ -d /tmp/r ]; then rm -rf /tmp/r; fi'
+      - shell: "if [ -d /tmp/r ]; then rm -rf /tmp/r; fi"

 
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
 
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers


@@ -259,20 +259,20 @@
       - config-file-provider:
           files:
             - file-id: npmrc
       - config-file-provider:
           files:
             - file-id: npmrc

-              target: '$HOME/.npmrc'
+              target: "$HOME/.npmrc"

             - file-id: pipconf
             - file-id: pipconf

-              target: '$HOME/.config/pip/pip.conf'
+              target: "$HOME/.config/pip/pip.conf"

             - file-id: clouds-yaml
             - file-id: clouds-yaml

-              target: '$HOME/.config/openstack/clouds.yaml'
+              target: "$HOME/.config/openstack/clouds.yaml"

       - timeout:
           type: absolute
       - timeout:
           type: absolute

-          timeout: '{build-timeout}'
-          timeout-var: 'BUILD_TIMEOUT'
+          timeout: "{build-timeout}"
+          timeout-var: "BUILD_TIMEOUT"

           fail: true
       - timestamps
       - ssh-agent-credentials:
           users:
           fail: true
       - timestamps
       - ssh-agent-credentials:
           users:

-            - 'opendaylight-jenkins-ssh'
+            - "opendaylight-jenkins-ssh"

       - openstack:
           single-use: true
 
       - openstack:
           single-use: true
 

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index eaee6cf0a8d29790c74120540fa2dcd2b746a3eb..e98c1e681490d6a8190c96124f2a86fc08851f3f 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -16,11 +16,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 90
 
     build-node: centos7-builder-2c-1g
     build-timeout: 90

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms:
       - centos-7
 
     platforms:
       - centos-7


@@ -36,11 +36,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 90
 
     build-node: centos7-builder-2c-1g
     build-timeout: 90

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms: centos-7
     templates: devstack
 
     platforms: centos-7
     templates: devstack


@@ -54,11 +54,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 75
 
     build-node: centos7-builder-2c-1g
     build-timeout: 75

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms: centos-7
     templates: devstack-pre-pip-queens
 
     platforms: centos-7
     templates: devstack-pre-pip-queens


@@ -72,11 +72,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 75
 
     build-node: centos7-builder-2c-1g
     build-timeout: 75

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms: centos-7
     templates: devstack-pre-pip-rocky
 
     platforms: centos-7
     templates: devstack-pre-pip-rocky


@@ -90,11 +90,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 75
 
     build-node: centos7-builder-2c-1g
     build-timeout: 75

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms: centos-7
     templates: devstack-pre-pip-stein
 
     platforms: centos-7
     templates: devstack-pre-pip-stein


@@ -108,11 +108,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 60
 
     build-node: centos7-builder-2c-1g
     build-timeout: 60

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms:
       - centos-7
 
     platforms:
       - centos-7


@@ -129,11 +129,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 90
 
     build-node: centos7-builder-2c-1g
     build-timeout: 90

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms:
       - ubuntu-16.04
 
     platforms:
       - ubuntu-16.04


@@ -150,11 +150,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 60
 
     build-node: centos7-builder-2c-1g
     build-timeout: 60

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms:
       - ubuntu-16.04
 
     platforms:
       - ubuntu-16.04


@@ -170,11 +170,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 75
 
     build-node: centos7-builder-2c-1g
     build-timeout: 75

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms:
       - ubuntu-16.04
 
     platforms:
       - ubuntu-16.04


@@ -190,11 +190,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 90
 
     build-node: centos7-builder-2c-1g
     build-timeout: 90

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms:
       - ubuntu-16.04
 
     platforms:
       - ubuntu-16.04


@@ -210,11 +210,11 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
+    archive-artifacts: "**/*.log"

 
     build-node: centos7-builder-2c-1g
     build-timeout: 60
 
     build-node: centos7-builder-2c-1g
     build-timeout: 60

-    cron: '00 H 1 * *'
+    cron: "00 H 1 * *"

 
     platforms: centos-7
     templates: robot
 
     platforms: centos-7
     templates: robot


@@ -228,8 +228,8 @@
     project: releng/builder
     project-name: builder
     branch: master
     project: releng/builder
     project-name: builder
     branch: master

-    archive-artifacts: '**/*.log'
-    jenkins-ssh-credential: 'opendaylight-jenkins-ssh'
+    archive-artifacts: "**/*.log"
+    jenkins-ssh-credential: "opendaylight-jenkins-ssh"

 
     build-node: centos7-builder-2c-1g
     # update-cloud-image: true
 
     build-node: centos7-builder-2c-1g
     # update-cloud-image: true

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index bd6f2fef58cd9f70ca9d9736208f8096fb2b1059..ac491283a2878dd5448bb408636276f5100fcf60 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -12,7 +12,7 @@
 
       - gerrit-maven-stage:
           sign-artifacts: true
 
       - gerrit-maven-stage:
           sign-artifacts: true

-          cron: ''
+          cron: ""

 
     java-version: openjdk11
     mvn-version: mvn35
 
     java-version: openjdk11
     mvn-version: mvn35


@@ -32,20 +32,20 @@
       #           - 'distribution-merge-{stream}'
       #         condition: SUCCESS
       #         trigger-with-no-params: true
       #           - 'distribution-merge-{stream}'
       #         condition: SUCCESS
       #         trigger-with-no-params: true

-      - '{project-name}-merge-{stream}':
+      - "{project-name}-merge-{stream}":

           build-timeout: 180
           mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
           build-timeout: 180
           mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2

-          disable-job: '{disable-job}'
+          disable-job: "{disable-job}"

 
       - gerrit-maven-stage:
           sign-artifacts: true
           mvn-central: false
           ossrh-profile-id: 6386ebbbf3a563
 
       - gerrit-maven-stage:
           sign-artifacts: true
           mvn-central: false
           ossrh-profile-id: 6386ebbbf3a563

-          cron: ''
+          cron: ""

 
     java-version: openjdk8
     mvn-version: mvn35
 
     java-version: openjdk8
     mvn-version: mvn35

-    disable-job: '{disable-job}'
+    disable-job: "{disable-job}"

 
 - job-group:
     name: odl-maven-verify-jobs
 
 - job-group:
     name: odl-maven-verify-jobs


@@ -58,7 +58,7 @@
     mvn-version: mvn35
 
 - job-template:
     mvn-version: mvn35
 
 - job-template:

-    name: '{project-name}-integration-{stream}'
+    name: "{project-name}-integration-{stream}"

 
     ######################
     # Default parameters #
 
     ######################
     # Default parameters #


@@ -78,68 +78,68 @@
     #####################
 
     project-type: freestyle
     #####################
 
     project-type: freestyle

-    node: '{build-node}'
-    jdk: '{java-version}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    jdk: "{java-version}"
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:

-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"

 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

 
     scm:
       - git-scm:
 
     scm:
       - git-scm:

-          refspec: ''
-          branch: '{branch}'
+          refspec: ""
+          branch: "{branch}"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
       - reverse:
 
     triggers:
       - reverse:

-          jobs: '{dependencies}'
-          result: 'success'
+          jobs: "{dependencies}"
+          result: "success"

 
     builders:
       - lf-jacoco-nojava-workaround
       - lf-provide-maven-settings:
 
     builders:
       - lf-jacoco-nojava-workaround
       - lf-provide-maven-settings:

-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"

       - maven-target:
       - maven-target:

-          maven-version: 'mvn35'
+          maven-version: "mvn35"

           goals: |
           goals: |

-              {mvn-goals}
-              {opendaylight-infra-mvn-opts}
+            {mvn-goals}
+            {opendaylight-infra-mvn-opts}

           java-opts:
           java-opts:

-            - '{mvn-opts}'
-          settings: '{mvn-settings}'
+            - "{mvn-opts}"
+          settings: "{mvn-settings}"

           settings-type: cfp
           settings-type: cfp

-          global-settings: 'global-settings'
+          global-settings: "global-settings"

           global-settings-type: cfp
 
     publishers:
       - email-notification:
           global-settings-type: cfp
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '{email-upstream}'
+          email-recipients: "{email-recipients}"
+          email-prefix: "{email-upstream}"

       - findbugs
       - lf-jacoco-report
       - lf-infra-publish
 
 - job-template:
       - findbugs
       - lf-jacoco-report
       - lf-infra-publish
 
 - job-template:

-    name: '{project-name}-merge-{stream}'
+    name: "{project-name}-merge-{stream}"

 
     ######################
     # Default parameters #
     ######################
 
     ######################
     # Default parameters #
     ######################

-    disable-job: 'false'
+    disable-job: "false"

 
     archive-artifacts: >
       **/*.log
 
     archive-artifacts: >
       **/*.log


@@ -147,8 +147,8 @@
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt

-    cron: '@daily'
-    mvn-opts: ''
+    cron: "@daily"
+    mvn-opts: ""

     mvn-version: mvn35
     java-version: openjdk8
 
     mvn-version: mvn35
     java-version: openjdk8
 


@@ -161,9 +161,9 @@
     # separate lifecycle:
     #     https://issues.apache.org/jira/browse/MNG-5666
     project-type: maven
     # separate lifecycle:
     #     https://issues.apache.org/jira/browse/MNG-5666
     project-type: maven

-    node: '{build-node}'
-    jdk: '{java-version}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    jdk: "{java-version}"
+    disabled: "{disable-job}"

 
     properties:
       - opendaylight-infra-properties:
 
     properties:
       - opendaylight-infra-properties:


@@ -171,54 +171,54 @@
 
     parameters:
       - opendaylight-infra-parameters:
 
     parameters:
       - opendaylight-infra-parameters:

-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"

       - string:
           name: STREAM
       - string:
           name: STREAM

-          default: '{stream}'
+          default: "{stream}"

           description: "String representing release name"
 
     scm:
       - gerrit-trigger-scm:
           description: "String representing release name"
 
     scm:
       - gerrit-trigger-scm:

-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: ""
+          choosing-strategy: "default"

 
     wrappers:
       - opendaylight-infra-wrappers:
 
     wrappers:
       - opendaylight-infra-wrappers:

-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"

 
     triggers:
 
     triggers:

-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"

       - gerrit-trigger-patch-merged:
       - gerrit-trigger-patch-merged:

-          gerrit-server-name: '{gerrit-server-name}'
-          name: '{project}'
-          branch: '{branch}'
-          files: '**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          name: "{project}"
+          branch: "{branch}"
+          files: "**"
+          forbidden-files: ""

 
     prebuilders:
       - lf-jacoco-nojava-workaround
       - lf-provide-maven-settings:
 
     prebuilders:
       - lf-jacoco-nojava-workaround
       - lf-provide-maven-settings:

-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"

       - lf-maven-install:
       - lf-maven-install:

-          mvn-version: '{mvn-version}'
+          mvn-version: "{mvn-version}"

 
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
 
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:

-      maven-name: '{mvn-version}'
+      maven-name: "{mvn-version}"

       goals: >
       goals: >

-          {mvn-goals}
-          -Dmerge
-          -Dstream={stream}
-          {opendaylight-infra-mvn-opts}
-      maven-opts: '{mvn-opts}'
-      settings: '{mvn-settings}'
+        {mvn-goals}
+        -Dmerge
+        -Dstream={stream}
+        {opendaylight-infra-mvn-opts}
+      maven-opts: "{mvn-opts}"
+      settings: "{mvn-settings}"

       settings-type: cfp
       settings-type: cfp

-      global-settings: 'global-settings'
+      global-settings: "global-settings"

       global-settings-type: cfp
       post-step-run-condition: UNSTABLE
 
       global-settings-type: cfp
       post-step-run-condition: UNSTABLE
 


@@ -227,10 +227,10 @@
 
     publishers:
       - email-notification:
 
     publishers:
       - email-notification:

-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"

       - maven-deploy:
       - maven-deploy:

-          id: ''
+          id: ""

           unique-version: true
           deploy-unstable: false
       - lf-jacoco-report
           unique-version: true
           deploy-unstable: false
       - lf-jacoco-report

diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml
index dcd125dc6719bf05d1fed05b721843cc41c18007..25ed5632cd91a6107de8657bf5e34ea899df0145 100644 (file)
--- a/jjb/releng-views.yaml
+++ b/jjb/releng-views.yaml
@@ -1,19 +1,19 @@
 ---
 - project:
 ---
 - project:

-    name: '00-Empty View'
+    name: "00-Empty View"

     views:
       - common-view
     views:
       - common-view

-    view-name: '00-Empty View'
+    view-name: "00-Empty View"

     view-description: >
       Empty job view. This is used as the default landing view to keep the
       Jenkins UI responding better while a) under high load and b) when there
       are a lot of jobs defined in the system
     view-description: >
       Empty job view. This is used as the default landing view to keep the
       Jenkins UI responding better while a) under high load and b) when there
       are a lot of jobs defined in the system

-    view-regex: ''
+    view-regex: ""

 
 - view:
     name: 01-Recent
 
 - view:
     name: 01-Recent

-    regex: '.*'
-    description: 'List of most recent jobs'
+    regex: ".*"
+    description: "List of most recent jobs"

     job-filters:
       most-recent:
         max-to-include: 25
     job-filters:
       most-recent:
         max-to-include: 25


@@ -39,13 +39,13 @@
     views:
       - common-view
     view-name: All-Sonar
     views:
       - common-view
     view-name: All-Sonar

-    view-regex: '.*-sonar$'
-    view-description: 'List of Sonar jobs'
+    view-regex: ".*-sonar$"
+    view-description: "List of Sonar jobs"

 
 - view:
     name: CLM
 
 - view:
     name: CLM

-    description: 'List of CLM jobs'
-    regex: '.*-clm-.*'
+    description: "List of CLM jobs"
+    regex: ".*-clm-.*"

     view-type: list
     filter-executors: false
     filter-queue: false
     view-type: list
     filter-executors: false
     filter-queue: false


@@ -65,40 +65,40 @@
     views:
       - csit-view
     view-name: CSIT-1node
     views:
       - csit-view
     view-name: CSIT-1node

-    view-description: 'List of CSIT 1node jobs'
-    view-regex: '^.*-csit-1node.*'
+    view-description: "List of CSIT 1node jobs"
+    view-regex: "^.*-csit-1node.*"

 
 - project:
     name: CSIT-3node
     views:
       - csit-view
     view-name: CSIT-3node
 
 - project:
     name: CSIT-3node
     views:
       - csit-view
     view-name: CSIT-3node

-    view-description: 'List of CSIT 3node jobs'
-    view-regex: '^.*-csit-3node.*'
+    view-description: "List of CSIT 3node jobs"
+    view-regex: "^.*-csit-3node.*"

 
 - project:
     name: CSIT
     views:
       - csit-view
     view-name: CSIT
 
 - project:
     name: CSIT
     views:
       - csit-view
     view-name: CSIT

-    view-description: 'List of CSIT jobs'
-    view-regex: '^.*-csit-.*'
+    view-description: "List of CSIT jobs"
+    view-regex: "^.*-csit-.*"

 
 - project:
     name: CSIT-Verify
     views:
       - csit-view
     view-name: CSIT-Verify
 
 - project:
     name: CSIT-Verify
     views:
       - csit-view
     view-name: CSIT-Verify

-    view-description: 'List of CSIT Verify jobs'
-    view-regex: '^.*-csit-verify.*'
+    view-description: "List of CSIT Verify jobs"
+    view-regex: "^.*-csit-verify.*"

 
 - project:
     name: Distribution-Check
     views:
       - common-view
     view-name: Distribution-Check
 
 - project:
     name: Distribution-Check
     views:
       - common-view
     view-name: Distribution-Check

-    view-description: 'List of Distribution Check jobs'
-    view-regex: '.*-distribution.*-check-.*'
+    view-description: "List of Distribution Check jobs"
+    view-regex: ".*-distribution.*-check-.*"

 
 - project:
     name: Distribution-Jobs
 
 - project:
     name: Distribution-Jobs


@@ -106,96 +106,96 @@
       - common-view
     view-name: Distribution-Jobs
     view-description: >
       - common-view
     view-name: Distribution-Jobs
     view-description: >

-        List of Distribution jobs (test, check, merge, deploy, offline, verify)
-    view-regex: '^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*'
+      List of Distribution jobs (test, check, merge, deploy, offline, verify)
+    view-regex: "^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*"

 
 - project:
     name: Gate
     views:
       - common-view
     view-name: Gate
 
 - project:
     name: Gate
     views:
       - common-view
     view-name: Gate

-    view-description: 'List of Gate jobs'
-    view-regex: '.*-gate-.*'
+    view-description: "List of Gate jobs"
+    view-regex: ".*-gate-.*"

 
 - project:
     name: Integration
     views:
       - common-view
     view-name: Integration
 
 - project:
     name: Integration
     views:
       - common-view
     view-name: Integration

-    view-description: 'List of Integration jobs'
-    view-regex: '.*-integration-.*'
+    view-description: "List of Integration jobs"
+    view-regex: ".*-integration-.*"

 
 - project:
     name: Javadoc
     views:
       - common-view
     view-name: Javadoc
 
 - project:
     name: Javadoc
     views:
       - common-view
     view-name: Javadoc

-    view-description: 'List of Javadoc jobs'
-    view-regex: '.*-javadoc-.*'
+    view-description: "List of Javadoc jobs"
+    view-regex: ".*-javadoc-.*"

 
 - project:
     name: Maven-Stage
     views:
       - common-view
     view-name: Maven-Stage
 
 - project:
     name: Maven-Stage
     views:
       - common-view
     view-name: Maven-Stage

-    view-description: 'List of Maven Stage jobs'
-    view-regex: '.*-maven-stage-.*'
+    view-description: "List of Maven Stage jobs"
+    view-regex: ".*-maven-stage-.*"

 
 - project:
     name: Maven-Verify-Deps
     views:
       - common-view
     view-name: Maven-Verify-Deps
 
 - project:
     name: Maven-Verify-Deps
     views:
       - common-view
     view-name: Maven-Verify-Deps

-    view-description: 'List of Maven Verify Deps jobs'
-    view-regex: '.*-maven-verify-deps-.*'
+    view-description: "List of Maven Verify Deps jobs"
+    view-regex: ".*-maven-verify-deps-.*"

 
 - project:
     name: Merge-Jobs
     views:
       - common-view
     view-name: Merge-Jobs
 
 - project:
     name: Merge-Jobs
     views:
       - common-view
     view-name: Merge-Jobs

-    view-description: 'List of Merge jobs'
-    view-regex: '.*-merge-.*'
+    view-description: "List of Merge jobs"
+    view-regex: ".*-merge-.*"

 
 - project:
     name: Patch-Test
     views:
       - common-view
     view-name: Patch-Test
 
 - project:
     name: Patch-Test
     views:
       - common-view
     view-name: Patch-Test

-    view-description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin'
-    view-regex: '.*-patch-test-.*'
+    view-description: "List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin"
+    view-regex: ".*-patch-test-.*"

 
 - project:
     name: Sanity
     views:
       - common-view
     view-name: Sanity
 
 - project:
     name: Sanity
     views:
       - common-view
     view-name: Sanity

-    view-description: 'List of Sanity jobs'
-    view-regex: '.*-sanity-.*'
+    view-description: "List of Sanity jobs"
+    view-regex: ".*-sanity-.*"

 
 - project:
     name: Thirdparty
     views:
       - common-view
     view-name: Thirdparty
 
 - project:
     name: Thirdparty
     views:
       - common-view
     view-name: Thirdparty

-    view-description: 'List of ODL Nexus Thirdparty dependencies jobs'
-    view-regex: '.*-thirdparty-.*'
+    view-description: "List of ODL Nexus Thirdparty dependencies jobs"
+    view-regex: ".*-thirdparty-.*"

 
 - project:
     name: Validate-AR
     views:
       - common-view
     view-name: Validate
 
 - project:
     name: Validate-AR
     views:
       - common-view
     view-name: Validate

-    view-description: 'List of Validate jobs'
-    view-regex: '.*-validate-autorelease-.*'
+    view-description: "List of Validate jobs"
+    view-regex: ".*-validate-autorelease-.*"

 
 - project:
     name: Verify
     views:
       - common-view
     view-name: Verify
 
 - project:
     name: Verify
     views:
       - common-view
     view-name: Verify

-    view-description: 'List of Verify jobs, exluding CSIT jobs'
-    view-regex: '^(?!.*-csit).*-verify-.*'
+    view-description: "List of Verify jobs, exluding CSIT jobs"
+    view-regex: "^(?!.*-csit).*-verify-.*"

 
 - project:
     name: builder
 
 - project:
     name: builder

diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml
index bf8efaf164aacaf38974209aa450f7f603cb8258..11e3fe689656ee64c0c6d29c8a29e64508c9ee23 100644 (file)
--- a/jjb/serviceutils/serviceutils-patch-test.yaml
+++ b/jjb/serviceutils/serviceutils-patch-test.yaml
@@ -4,30 +4,30 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'serviceutils'
+    project: "serviceutils"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
-    jdk: 'openjdk8'
+    os-branch: "queens"
+    jdk: "openjdk8"

 
     feature:
       - netvirt:
           csit-list: >
 
     feature:
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 4c9d5db13e47417ff3070ad266166a7cf62fd657..dd4642a3a6d09a9e0bfc52c015c64e79391eb62b 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -2,9 +2,9 @@
 - project:
     name: serviceutils-silicon
     jobs:
 - project:
     name: serviceutils-silicon
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/


@@ -12,22 +12,22 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    branch: 'master'
+    branch: "master"

     stream: silicon
 
     stream: silicon
 

-    project: 'serviceutils'
-    project-name: 'serviceutils'
+    project: "serviceutils"
+    project-name: "serviceutils"

     build-node: centos7-builder-2c-2g
     build-node: centos7-builder-2c-2g

-    java-version: 'openjdk11'
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "serviceutils-settings"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"

 
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba


@@ -35,9 +35,9 @@
 - project:
     name: serviceutils-aluminium
     jobs:
 - project:
     name: serviceutils-aluminium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/


@@ -45,22 +45,22 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    branch: 'stable/aluminium'
+    branch: "stable/aluminium"

     stream: aluminium
 
     stream: aluminium
 

-    project: 'serviceutils'
-    project-name: 'serviceutils'
+    project: "serviceutils"
+    project-name: "serviceutils"

     build-node: centos7-builder-2c-2g
     build-node: centos7-builder-2c-2g

-    java-version: 'openjdk11'
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "serviceutils-settings"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"

 
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba


@@ -68,9 +68,9 @@
 - project:
     name: serviceutils-magnesium
     jobs:
 - project:
     name: serviceutils-magnesium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/


@@ -78,22 +78,22 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    branch: 'stable/magnesium'
+    branch: "stable/magnesium"

     stream: magnesium
 
     stream: magnesium
 

-    project: 'serviceutils'
-    project-name: 'serviceutils'
+    project: "serviceutils"
+    project-name: "serviceutils"

     build-node: centos7-builder-2c-2g
     build-node: centos7-builder-2c-2g

-    java-version: 'openjdk11'
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "serviceutils-settings"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"

 
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba


@@ -101,9 +101,9 @@
 - project:
     name: serviceutils-sodium
     jobs:
 - project:
     name: serviceutils-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/


@@ -111,21 +111,21 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    branch: 'stable/sodium'
+    branch: "stable/sodium"

     stream: sodium
 
     stream: sodium
 

-    project: 'serviceutils'
-    project-name: 'serviceutils'
+    project: "serviceutils"
+    project-name: "serviceutils"

     build-node: centos7-builder-2c-2g
     build-node: centos7-builder-2c-2g

-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "serviceutils-settings"
+    mvn-opts: "-Xmx1024m"

     build-timeout: 90
     dependencies: >
     build-timeout: 90
     dependencies: >

-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"

 
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba


@@ -135,17 +135,17 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'serviceutils'
-    project-name: 'serviceutils'
-    branch: 'master'
+    project: "serviceutils"
+    project-name: "serviceutils"
+    branch: "master"

     build-node: centos7-builder-4c-4g
     build-node: centos7-builder-4c-4g

-    java-version: 'openjdk11'
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "serviceutils-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: serviceutils-info
 
 - project:
     name: serviceutils-info

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 8b01c9b1440b3d6554f8bee1387a534fe95cf887..da86d76c741cbe1a5a8bc1c4dbaecb20dcee1252 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -5,38 +5,38 @@
       - inttest-csit-3node-docker
 
     # The project name
       - inttest-csit-3node-docker
 
     # The project name

-    project: 'sfc'
+    project: "sfc"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'full-deploy'
+    functionality: "full-deploy"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-sfc-provider,
-        odl-sfc-ui,
-        odl-sfc-openflow-renderer,
-        odl-sfc-scf-openflow,
-        odl-sfc-sb-rest,
-        odl-sfc-ovs,
-        odl-sfc-netconf
+      odl-sfc-provider,
+      odl-sfc-ui,
+      odl-sfc-openflow-renderer,
+      odl-sfc-scf-openflow,
+      odl-sfc-sb-rest,
+      odl-sfc-ovs,
+      odl-sfc-netconf

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index 09f98271946d93fa1b874b6d8a64254f62c2fc11..7739822f6ab2dfe090c168a732c1a4812fa72b02 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -4,33 +4,32 @@
     jobs:
       - inttest-csit-3node
 
     jobs:
       - inttest-csit-3node
 

-

     # The project name
     # The project name

-    project: 'sfc'
+    project: "sfc"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'rest-basic'
+    functionality: "rest-basic"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-sfc-provider-rest'
+    install-features: "odl-sfc-provider-rest"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index 1d7ef2c943dc68f3160302d11daa549d1428f82b..781f4b464593d0a554e302387236d4c74c5565fd 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -5,33 +5,33 @@
       - inttest-patch-test
 
     # The project name
       - inttest-patch-test
 
     # The project name

-    project: 'sfc'
+    project: "sfc"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          java-version: 'openjdk11'
+          branch: "master"
+          java-version: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          java-version: 'openjdk11'
+          branch: "stable/aluminium"
+          java-version: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          java-version: 'openjdk11'
+          branch: "stable/magnesium"
+          java-version: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
+    os-branch: "queens"

 
     feature:
       - basic:
           csit-list: >
 
     feature:
       - basic:
           csit-list: >

-              sfc-csit-3node-rest-basic-all-{stream}
+            sfc-csit-3node-rest-basic-all-{stream}

 
       - full:
           csit-list: >
 
       - full:
           csit-list: >

-              sfc-csit-3node-docker-full-deploy-all-{stream}
+            sfc-csit-3node-docker-full-deploy-all-{stream}

 
       - netvirt:
           csit-list: >
 
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-sfc-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-sfc-{stream}

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 9afaad5ff1fce89c9e61aba72b284387fbfd1dff..bb6defdd35aa1d508f75186986f9fb2ebd32bf2f 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -2,18 +2,18 @@
 - project:
     name: sfc-python
     jobs:
 - project:
     name: sfc-python
     jobs:

-      - 'gerrit-tox-verify'
+      - "gerrit-tox-verify"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
+          branch: "master"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
+          branch: "stable/aluminium"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    project: 'sfc'
-    project-name: 'sfc'
+    project: "sfc"
+    project-name: "sfc"

     tox-dir: sfc-py
     tox-dir: sfc-py

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 9be59825c8490f9a98d2515a73be46febdf5b80f..1862cf8fc05c47000d7fc7d0e7b796675623fa8b 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sfc-silicon
     jobs:
 - project:
     name: sfc-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/


@@ -11,15 +11,15 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    project: "sfc"
+    project-name: "sfc"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 120
     build-timeout: 120

-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"

     build-node: centos7-builder-8c-8g
 
     # Used by the release job
     build-node: centos7-builder-8c-8g
 
     # Used by the release job


@@ -28,7 +28,7 @@
 - project:
     name: sfc-aluminium
     jobs:
 - project:
     name: sfc-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/


@@ -37,15 +37,15 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    project: "sfc"
+    project-name: "sfc"
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 120
     build-timeout: 120

-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"

     build-node: centos7-builder-8c-8g
 
     # Used by the release job
     build-node: centos7-builder-8c-8g
 
     # Used by the release job


@@ -54,7 +54,7 @@
 - project:
     name: sfc-magnesium
     jobs:
 - project:
     name: sfc-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/


@@ -63,15 +63,15 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    project: "sfc"
+    project-name: "sfc"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 120
     build-timeout: 120

-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"

     build-node: centos7-builder-8c-8g
 
     # Used by the release job
     build-node: centos7-builder-8c-8g
 
     # Used by the release job


@@ -80,8 +80,8 @@
 - project:
     name: sfc-sodium
     jobs:
 - project:
     name: sfc-sodium
     jobs:

-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/


@@ -90,14 +90,14 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/sodium'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    project: "sfc"
+    project-name: "sfc"
+    branch: "stable/sodium"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     build-timeout: 120
     build-timeout: 120

-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
+    dependencies: "openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}"
+    email-upstream: "[sfc] [openflowplugin] [ovsdb] [lispflowmapping]"

     build-node: centos7-builder-8c-8g
 
     # Used by the release job
     build-node: centos7-builder-8c-8g
 
     # Used by the release job


@@ -107,16 +107,16 @@
     name: sfc-sonar
     jobs:
       - gerrit-maven-sonar
     name: sfc-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    project: "sfc"
+    project-name: "sfc"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "sfc-settings"
+    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: sfc-info
 
 - project:
     name: sfc-info

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index bcd04051586bf42919de32c494f005075773ad9b..62e66caf30f1cf39b0591ad9abbf134c5fc240ba 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -6,13 +6,13 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'master'
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
+    project: "snmp"
+    project-name: "snmp"
+    branch: "master"
+    mvn-settings: "snmp-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[snmp] [odlparent]"

 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6


@@ -24,13 +24,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/aluminium'
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
+    project: "snmp"
+    project-name: "snmp"
+    branch: "stable/aluminium"
+    mvn-settings: "snmp-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[snmp] [odlparent]"

 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6


@@ -42,13 +42,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/magnesium'
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
+    project: "snmp"
+    project-name: "snmp"
+    branch: "stable/magnesium"
+    mvn-settings: "snmp-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[snmp] [odlparent]"

 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6


@@ -60,13 +60,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/sodium'
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
+    project: "snmp"
+    project-name: "snmp"
+    branch: "stable/sodium"
+    mvn-settings: "snmp-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[snmp] [odlparent]"

 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6


@@ -86,15 +86,15 @@
     name: snmp-sonar
     jobs:
       - gerrit-maven-sonar
     name: snmp-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'master'
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "snmp"
+    project-name: "snmp"
+    branch: "master"
+    mvn-settings: "snmp-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: snmp-info
 
 - project:
     name: snmp-info

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 3b0a1f0fa5bf12674cdd68edd45a2070c6a6217b..9093535473368bb655f3244c3f667b8e85a2c1a8 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -2,7 +2,7 @@
 - project:
     name: snmp4sdn-silicon
     jobs:
 - project:
     name: snmp4sdn-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/


@@ -11,13 +11,13 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'master'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "master"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5


@@ -25,7 +25,7 @@
 - project:
     name: snmp4sdn-aluminium
     jobs:
 - project:
     name: snmp4sdn-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/


@@ -34,13 +34,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/aluminium'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "stable/aluminium"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5


@@ -48,7 +48,7 @@
 - project:
     name: snmp4sdn-magnesium
     jobs:
 - project:
     name: snmp4sdn-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/


@@ -57,13 +57,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/magnesium'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "stable/magnesium"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5


@@ -71,7 +71,7 @@
 - project:
     name: snmp4sdn-sodium
     jobs:
 - project:
     name: snmp4sdn-sodium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/
           build-node: centos7-builder-2c-2g
           project-pattern: snmp4sdn
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/


@@ -80,13 +80,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/sodium'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "stable/sodium"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[snmp4sdn] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5


@@ -107,15 +107,15 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'master'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "snmp4sdn"
+    project-name: "snmp4sdn"
+    branch: "master"
+    mvn-settings: "snmp4sdn-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: snmp4sdn-info
 
 - project:
     name: snmp4sdn-info

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index b32a4547ab45a2090548fd411d255455beae255b..b70b02be4e6dad856dfffabb4820339ce5a89c69 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -5,31 +5,31 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'sxp'
+    project: "sxp"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'basic'
+    functionality: "basic"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-sxp-routing'
+    install-features: "odl-restconf,odl-sxp-routing"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
index f83cbc2081982f75ced6aa28ba626ee9e386e488..bb49ee440391fe0d781ba9e7bdaa4322ba69a536 100644 (file)
--- a/jjb/sxp/sxp-csit-binding-origin.yaml
+++ b/jjb/sxp/sxp-csit-binding-origin.yaml
@@ -5,31 +5,31 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'sxp'
+    project: "sxp"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'binding-origin'
+    functionality: "binding-origin"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-sxp-routing'
+    install-features: "odl-restconf,odl-sxp-routing"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml
index 7d29eddd3718f35a27b715e1fcdd4bc079dad146..78a4e5db0a4fdf8568c20f66eadfe1b3f279ef70 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-binding.yaml
+++ b/jjb/sxp/sxp-csit-cluster-binding.yaml
@@ -5,31 +5,31 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'sxp'
+    project: "sxp"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'cluster-binding'
+    functionality: "cluster-binding"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-sxp-routing'
+    install-features: "odl-restconf,odl-sxp-routing"

 
     # Robot custom options:
 
     # Robot custom options:

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index e1f013fa5cfb4c5bd858faf357174c26ea4d4897..987fe98dc828d371cb948ba26fe13a7b9e6d170b 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -5,31 +5,31 @@
       - inttest-csit-3node
 
     # The project name
       - inttest-csit-3node
 
     # The project name

-    project: 'sxp'
+    project: "sxp"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'clustering'
+    functionality: "clustering"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-sxp-routing'
+    install-features: "odl-restconf,odl-sxp-routing"

 
     # Robot custom options:
 
     # Robot custom options:

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index a71eab0c11d28ac90bd8faabd50e829fca9331f7..b21489ea958bd601bbce2e9b6fab03699a7abd7c 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -5,31 +5,31 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'sxp'
+    project: "sxp"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'filtering'
+    functionality: "filtering"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-sxp-routing'
+    install-features: "odl-restconf,odl-sxp-routing"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index 03690909029eea6db2050bf5e24785c36a6de3ac..fa734f36a21e4c2611cf109048708b5c216bb3e1 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -5,31 +5,31 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'sxp'
+    project: "sxp"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'performance'
+    functionality: "performance"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-sxp-routing,odl-sxp-robot'
+    install-features: "odl-restconf,odl-sxp-routing,odl-sxp-robot"

 
     # Robot custom options:
 
     # Robot custom options:

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 9951cb619ebfe689b085a2b7dabe854b0724bca0..874aae89b7e85988e3f5b53b9fd0d2e5cebd5f3d 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -5,31 +5,31 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'sxp'
+    project: "sxp"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'topology'
+    functionality: "topology"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-sxp-routing'
+    install-features: "odl-restconf,odl-sxp-routing"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 522964425327e0c089205fee130d526d4f851a27..390ecdaf896d15e5b9e3f1dd08246f8bfc4fe3c8 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-silicon
     jobs:
 - project:
     name: sxp-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/


@@ -10,18 +10,18 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    java-version: 'openjdk11'
+    java-version: "openjdk11"

 
     stream: silicon
 
     stream: silicon

-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"

 
 

-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"

 
 

-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
     # Used by the release job
     staging-profile-id: a6909c75719b7


@@ -29,7 +29,7 @@
 - project:
     name: sxp-aluminium
     jobs:
 - project:
     name: sxp-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/


@@ -37,18 +37,18 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    java-version: 'openjdk11'
+    java-version: "openjdk11"

 
     stream: aluminium
 
     stream: aluminium

-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/aluminium'
+    project: "sxp"
+    project-name: "sxp"
+    branch: "stable/aluminium"

 
 

-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"

 
 

-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
     # Used by the release job
     staging-profile-id: a6909c75719b7


@@ -56,7 +56,7 @@
 - project:
     name: sxp-magnesium
     jobs:
 - project:
     name: sxp-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/


@@ -64,18 +64,18 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    java-version: 'openjdk11'
+    java-version: "openjdk11"

 
     stream: magnesium
 
     stream: magnesium

-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/magnesium'
+    project: "sxp"
+    project-name: "sxp"
+    branch: "stable/magnesium"

 
 

-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"

 
 

-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
     # Used by the release job
     staging-profile-id: a6909c75719b7


@@ -83,7 +83,7 @@
 - project:
     name: sxp-sodium
     jobs:
 - project:
     name: sxp-sodium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           build-node: centos7-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/


@@ -95,15 +95,15 @@
       - openjdk8
 
     stream: sodium
       - openjdk8
 
     stream: sodium

-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/sodium'
+    project: "sxp"
+    project-name: "sxp"
+    branch: "stable/sodium"

 
 

-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"

 
 

-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"

 
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
     # Used by the release job
     staging-profile-id: a6909c75719b7


@@ -123,16 +123,16 @@
     name: sxp-sonar
     jobs:
       - gerrit-maven-sonar
     name: sxp-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: sxp-info
 
 - project:
     name: sxp-info

diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml
index 1a02333063fb72fb6ab03873e931c4ace8baefdc..d9af85a8ab76c6cf7e01bba9217e8bb120307fa9 100644 (file)
--- a/jjb/telemetry/telemetry-csit-basic.yaml
+++ b/jjb/telemetry/telemetry-csit-basic.yaml
@@ -6,31 +6,31 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'telemetry'
+    project: "telemetry"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'basic'
+    functionality: "basic"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-telemetry-all'
+    install-features: "odl-telemetry-all"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index 97853860cca4a8c1d934f3a3a3da52579f31c8b8..7ed6c8c94c7a3340efd0d1da8b256e1b2a71f473 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -2,24 +2,24 @@
 - project:
     name: telemetry-silicon
     jobs:
 - project:
     name: telemetry-silicon
     jobs:

-      - 'odl-maven-jobs'
+      - "odl-maven-jobs"

       - odl-maven-verify-jobs
       - odl-maven-verify-jobs

-      - '{project-name}-integration-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-integration-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: silicon
           build-node: centos7-builder-2c-2g
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: silicon

-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'master'
-    mvn-settings: 'telemetry-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[telemetry]'
-    archive-artifacts: ''
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "master"
+    mvn-settings: "telemetry-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[telemetry]"
+    archive-artifacts: ""

 
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
     # Used by the release job
     staging-profile-id: 8ed9c52266504


@@ -27,24 +27,24 @@
 - project:
     name: telemetry-aluminium
     jobs:
 - project:
     name: telemetry-aluminium
     jobs:

-      - 'odl-maven-jobs'
+      - "odl-maven-jobs"

       - odl-maven-verify-jobs
       - odl-maven-verify-jobs

-      - '{project-name}-integration-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-integration-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: aluminium
           build-node: centos7-builder-2c-2g
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: aluminium

-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'stable/aluminium'
-    mvn-settings: 'telemetry-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[telemetry]'
-    archive-artifacts: ''
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "stable/aluminium"
+    mvn-settings: "telemetry-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[telemetry]"
+    archive-artifacts: ""

 
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
     # Used by the release job
     staging-profile-id: 8ed9c52266504


@@ -52,24 +52,24 @@
 - project:
     name: telemetry-magnesium
     jobs:
 - project:
     name: telemetry-magnesium
     jobs:

-      - 'odl-maven-jobs'
+      - "odl-maven-jobs"

       - odl-maven-verify-jobs
       - odl-maven-verify-jobs

-      - '{project-name}-integration-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-integration-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: magnesium
           build-node: centos7-builder-2c-2g
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: magnesium

-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'stable/magnesium'
-    mvn-settings: 'telemetry-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[telemetry]'
-    archive-artifacts: ''
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "stable/magnesium"
+    mvn-settings: "telemetry-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[telemetry]"
+    archive-artifacts: ""

 
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
     # Used by the release job
     staging-profile-id: 8ed9c52266504


@@ -77,24 +77,24 @@
 - project:
     name: telemetry-sodium
     jobs:
 - project:
     name: telemetry-sodium
     jobs:

-      - 'odl-maven-jobs'
+      - "odl-maven-jobs"

       - odl-maven-verify-jobs
       - odl-maven-verify-jobs

-      - '{project-name}-integration-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-integration-{stream}"
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: sodium
           build-node: centos7-builder-2c-2g
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
     stream: sodium

-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'stable/sodium'
-    mvn-settings: 'telemetry-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[telemetry]'
-    archive-artifacts: ''
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "stable/sodium"
+    mvn-settings: "telemetry-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[telemetry]"
+    archive-artifacts: ""

 
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
     # Used by the release job
     staging-profile-id: 8ed9c52266504


@@ -115,16 +115,16 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'master'
-    mvn-settings: 'telemetry-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "master"
+    mvn-settings: "telemetry-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: telemetry-info
 
 - project:
     name: telemetry-info

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 047e561851da0c31457e68ab9756527e8d1741d9..64b02a217ecfcb28e78f20890de64f98ad0ac02a 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -2,7 +2,7 @@
 - project:
     name: transportpce-silicon
     jobs:
 - project:
     name: transportpce-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/


@@ -13,15 +13,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'transportpce'
-    project-name: 'transportpce'
+    project: "transportpce"
+    project-name: "transportpce"

     stream: silicon
     stream: silicon

-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "transportpce-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4


@@ -29,7 +29,7 @@
 - project:
     name: transportpce-aluminium
     jobs:
 - project:
     name: transportpce-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/


@@ -40,15 +40,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'transportpce'
-    project-name: 'transportpce'
+    project: "transportpce"
+    project-name: "transportpce"

     stream: aluminium
     stream: aluminium

-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "transportpce-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4


@@ -56,7 +56,7 @@
 - project:
     name: transportpce-magnesium
     jobs:
 - project:
     name: transportpce-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/


@@ -67,15 +67,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 

-    project: 'transportpce'
-    project-name: 'transportpce'
+    project: "transportpce"
+    project-name: "transportpce"

     stream: magnesium
     stream: magnesium

-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "transportpce-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4


@@ -83,7 +83,7 @@
 - project:
     name: transportpce-sodium
     jobs:
 - project:
     name: transportpce-sodium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/


@@ -94,14 +94,14 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 

-    project: 'transportpce'
-    project-name: 'transportpce'
+    project: "transportpce"
+    project-name: "transportpce"

     stream: sodium
     stream: sodium

-    branch: 'stable/sodium'
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
+    branch: "stable/sodium"
+    mvn-settings: "transportpce-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"

 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4


@@ -122,16 +122,16 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'transportpce'
-    project-name: 'transportpce'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "transportpce"
+    project-name: "transportpce"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "transportpce-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: transportpce-info
 
 - project:
     name: transportpce-info

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index a793df832b2fca23c985ce49c655812ba897e3ea..056ad3c76d653712c3cd803cd5fa18d7cc31f17d 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -6,36 +6,36 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'tsdr'
+    project: "tsdr"

 
     # The functionality under test to verify
 
     # The functionality under test to verify

-    functionality: 'cassandra-datastore'
+    functionality: "cassandra-datastore"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-tsdr-cassandra,
-        odl-tsdr-openflow-statistics-collector,
-        odl-tsdr-netflow-statistics-collector,
-        odl-tsdr-syslog-collector
+      odl-restconf,
+      odl-tsdr-cassandra,
+      odl-tsdr-openflow-statistics-collector,
+      odl-tsdr-netflow-statistics-collector,
+      odl-tsdr-syslog-collector

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index 88bb35d488cacaa46238c2d0443dfde6ce284781..13d09c29bb1141564c8e3f7bf499d64ac6f43afa 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -6,36 +6,36 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'tsdr'
+    project: "tsdr"

 
     # The functionality under test to verify
 
     # The functionality under test to verify

-    functionality: 'elasticsearch-datastore'
+    functionality: "elasticsearch-datastore"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-tsdr-elasticsearch,
-        odl-tsdr-openflow-statistics-collector,
-        odl-tsdr-netflow-statistics-collector,
-        odl-tsdr-syslog-collector
+      odl-restconf,
+      odl-tsdr-elasticsearch,
+      odl-tsdr-openflow-statistics-collector,
+      odl-tsdr-netflow-statistics-collector,
+      odl-tsdr-syslog-collector

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index 2f3d5578356066c37ea9d138e55437b856c76c3a..6a0526c4452df81cd79ffa91bed0ab6286c876fe 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -6,36 +6,36 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'tsdr'
+    project: "tsdr"

 
     # The functionality under test to verify
 
     # The functionality under test to verify

-    functionality: 'hbase-datastore'
+    functionality: "hbase-datastore"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-tsdr-hbase,
-        odl-tsdr-openflow-statistics-collector,
-        odl-tsdr-netflow-statistics-collector,
-        odl-tsdr-syslog-collector
+      odl-restconf,
+      odl-tsdr-hbase,
+      odl-tsdr-openflow-statistics-collector,
+      odl-tsdr-netflow-statistics-collector,
+      odl-tsdr-syslog-collector

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index dd606fafcf4d9074017d2fb365d8e72e84eaa6e4..41c1ea38cd848b0cf64380ed228c9e6ef985ffd0 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -6,36 +6,36 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'tsdr'
+    project: "tsdr"

 
     # The functionality under test to verify
 
     # The functionality under test to verify

-    functionality: 'hsqldb-datastore'
+    functionality: "hsqldb-datastore"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
     install-features: >
 
     # Features to install
     install-features: >

-        odl-restconf,
-        odl-tsdr-hsqldb,
-        odl-tsdr-openflow-statistics-collector,
-        odl-tsdr-netflow-statistics-collector,
-        odl-tsdr-syslog-collector
+      odl-restconf,
+      odl-tsdr-hsqldb,
+      odl-tsdr-openflow-statistics-collector,
+      odl-tsdr-netflow-statistics-collector,
+      odl-tsdr-syslog-collector

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index a2312ba86e74dd22bac02a3308c619e847d82431..b9092068d9a9548f3905111a063166eed757c4c2 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -2,7 +2,7 @@
 - project:
     name: tsdr-silicon
     jobs:
 - project:
     name: tsdr-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: tsdr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
           build-node: centos7-builder-2c-2g
           project-pattern: tsdr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/


@@ -11,13 +11,13 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'master'
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
+    project: "tsdr"
+    project-name: "tsdr"
+    branch: "master"
+    mvn-settings: "tsdr-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[tsdr]"

 
     # Used by the release job
     staging-profile-id: a69373036303c
 
     # Used by the release job
     staging-profile-id: a69373036303c


@@ -25,7 +25,7 @@
 - project:
     name: tsdr-aluminium
     jobs:
 - project:
     name: tsdr-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: tsdr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
           build-node: centos7-builder-2c-2g
           project-pattern: tsdr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/


@@ -34,13 +34,13 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/aluminium'
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
+    project: "tsdr"
+    project-name: "tsdr"
+    branch: "stable/aluminium"
+    mvn-settings: "tsdr-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[tsdr]"

 
     # Used by the release job
     staging-profile-id: a69373036303c
 
     # Used by the release job
     staging-profile-id: a69373036303c


@@ -48,7 +48,7 @@
 - project:
     name: tsdr-magnesium
     jobs:
 - project:
     name: tsdr-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: tsdr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
           build-node: centos7-builder-2c-2g
           project-pattern: tsdr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/


@@ -57,13 +57,13 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/magnesium'
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
+    project: "tsdr"
+    project-name: "tsdr"
+    branch: "stable/magnesium"
+    mvn-settings: "tsdr-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[tsdr]"

 
     # Used by the release job
     staging-profile-id: a69373036303c
 
     # Used by the release job
     staging-profile-id: a69373036303c


@@ -71,7 +71,7 @@
 - project:
     name: tsdr-sodium
     jobs:
 - project:
     name: tsdr-sodium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: tsdr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
           build-node: centos7-builder-2c-2g
           project-pattern: tsdr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/


@@ -80,13 +80,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/sodium'
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
+    project: "tsdr"
+    project-name: "tsdr"
+    branch: "stable/sodium"
+    mvn-settings: "tsdr-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: ""
+    email-upstream: "[tsdr]"

 
     # Used by the release job
     staging-profile-id: a69373036303c
 
     # Used by the release job
     staging-profile-id: a69373036303c


@@ -106,15 +106,15 @@
     name: tsdr-sonar
     jobs:
       - gerrit-maven-sonar
     name: tsdr-sonar
     jobs:
       - gerrit-maven-sonar

-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'master'
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "tsdr"
+    project-name: "tsdr"
+    branch: "master"
+    mvn-settings: "tsdr-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: tsdr-info
 
 - project:
     name: tsdr-info

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 9133b8cfcbbc553ff93ac3ca3c8d9765530ad7f5..11afb82b815506323ad7703d0ab1f73f3fe3f5e6 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -2,7 +2,7 @@
 - project:
     name: unimgr-silicon
     jobs:
 - project:
     name: unimgr-silicon
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/


@@ -11,18 +11,18 @@
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "unimgr"
+    project-name: "unimgr"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "unimgr-settings"
+    mvn-opts: "-Xmx1024m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream}
-    email-upstream: '[unimgr] [odlparent] [yangtools] [controller] [mdsal]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      mdsal-merge-{stream}
+    email-upstream: "[unimgr] [odlparent] [yangtools] [controller] [mdsal]"

     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     build-node: centos7-builder-4c-16g
 
     # Used by the release job


@@ -31,7 +31,7 @@
 - project:
     name: unimgr-aluminium
     jobs:
 - project:
     name: unimgr-aluminium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/


@@ -40,18 +40,18 @@
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/aluminium'
-    java-version: 'openjdk11'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "unimgr"
+    project-name: "unimgr"
+    branch: "stable/aluminium"
+    java-version: "openjdk11"
+    mvn-settings: "unimgr-settings"
+    mvn-opts: "-Xmx1024m"

     dependencies: >
     dependencies: >

-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream}
-    email-upstream: '[unimgr] [odlparent] [yangtools] [controller] [mdsal]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      mdsal-merge-{stream}
+    email-upstream: "[unimgr] [odlparent] [yangtools] [controller] [mdsal]"

     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     build-node: centos7-builder-4c-16g
 
     # Used by the release job


@@ -60,7 +60,7 @@
 - project:
     name: unimgr-magnesium
     jobs:
 - project:
     name: unimgr-magnesium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/


@@ -69,14 +69,14 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
+    project: "unimgr"
+    project-name: "unimgr"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "unimgr-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "ovsdb-merge-{stream}"
+    email-upstream: "[unimgr] [ovsdb]"

     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     build-node: centos7-builder-4c-16g
 
     # Used by the release job


@@ -85,7 +85,7 @@
 - project:
     name: unimgr-sodium
     jobs:
 - project:
     name: unimgr-sodium
     jobs:

-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":

           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/


@@ -94,13 +94,13 @@
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/sodium'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
+    project: "unimgr"
+    project-name: "unimgr"
+    branch: "stable/sodium"
+    mvn-settings: "unimgr-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "ovsdb-merge-{stream}"
+    email-upstream: "[unimgr] [ovsdb]"

     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     build-node: centos7-builder-4c-16g
 
     # Used by the release job


@@ -122,16 +122,16 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "unimgr"
+    project-name: "unimgr"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "unimgr-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: unimgr-info
 
 - project:
     name: unimgr-info

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 7ca1cbfc59bcda37cfd9826f47324c594034c883..4389bc77a629d79251743248a71e98b45f6216de 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -6,31 +6,31 @@
       - inttest-csit-verify-1node
 
     # The project name
       - inttest-csit-verify-1node
 
     # The project name

-    project: 'usc'
+    project: "usc"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'tcp'
+    functionality: "tcp"

 
     # Project branches
     stream:
       - silicon:
 
     # Project branches
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - all:
 
     install:
       - all:

-          scope: 'all'
+          scope: "all"

 
     # Features to install
 
     # Features to install

-    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-usc-channel-ui'
+    install-features: "odl-restconf,odl-mdsal-apidocs,odl-usc-channel-ui"

 
     # Robot custom options
 
     # Robot custom options

-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 524d4136b5946b19ea7540b4c735098bcff4441b..7a0bc0e3215bcfb4e19f4cf87edad29ee9535878 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -2,18 +2,18 @@
 - project:
     name: usc-silicon
     jobs:
 - project:
     name: usc-silicon
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: silicon
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: silicon

-    project: 'usc'
-    project-name: 'usc'
-    branch: 'master'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    project: "usc"
+    project-name: "usc"
+    branch: "master"
+    mvn-settings: "usc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}"
+    email-upstream: "[usc] [controller] [yangtools] [odlparent]"

 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe


@@ -21,18 +21,18 @@
 - project:
     name: usc-aluminium
     jobs:
 - project:
     name: usc-aluminium
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: aluminium
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: aluminium

-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/aluminium'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    project: "usc"
+    project-name: "usc"
+    branch: "stable/aluminium"
+    mvn-settings: "usc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}"
+    email-upstream: "[usc] [controller] [yangtools] [odlparent]"

 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe


@@ -40,18 +40,18 @@
 - project:
     name: usc-magnesium
     jobs:
 - project:
     name: usc-magnesium
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: magnesium
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: magnesium

-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/magnesium'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    project: "usc"
+    project-name: "usc"
+    branch: "stable/magnesium"
+    mvn-settings: "usc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}"
+    email-upstream: "[usc] [controller] [yangtools] [odlparent]"

 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe


@@ -59,18 +59,18 @@
 - project:
     name: usc-sodium
     jobs:
 - project:
     name: usc-sodium
     jobs:

-      - '{project-name}-maven-javadoc-jobs'
+      - "{project-name}-maven-javadoc-jobs"

       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: sodium
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: sodium

-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/sodium'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+    project: "usc"
+    project-name: "usc"
+    branch: "stable/sodium"
+    mvn-settings: "usc-settings"
+    mvn-opts: "-Xmx1024m"
+    dependencies: "controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}"
+    email-upstream: "[usc] [controller] [yangtools] [odlparent]"

 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe


@@ -91,15 +91,15 @@
     jobs:
       - gerrit-maven-sonar
 
     jobs:
       - gerrit-maven-sonar
 

-    project: 'usc'
-    project-name: 'usc'
-    branch: 'master'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "usc"
+    project-name: "usc"
+    branch: "master"
+    mvn-settings: "usc-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: usc-info
 
 - project:
     name: usc-info

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index b8a8061a068176e36c50474de784f9f6aa7290e9..4c5e0daacad03389778e261937ea21d69889fdff 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -5,37 +5,36 @@
       - inttest-csit-1node
 
     # The project name
       - inttest-csit-1node
 
     # The project name

-    project: 'yangtools'
+    project: "yangtools"

 
     # The functionality under test
 
     # The functionality under test

-    functionality: 'system'
+    functionality: "system"

 
     # Project branches.
     stream:
       - silicon:
 
     # Project branches.
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
     install:
       - only:
 
     install:
       - only:

-          scope: 'only'
+          scope: "only"

 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
 
     # Features to install
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
 
     # Features to install

-    install-features: 'odl-restconf'
+    install-features: "odl-restconf"

 
     # Robot custom options:
 
     # Robot custom options:

-    robot-options: ''
-
+    robot-options: ""

     # Additional patterns to archive
     # FIXME: Delete if no patterns.
     # Additional patterns to archive
     # FIXME: Delete if no patterns.

diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
index 43718d58bfe614597c79d7ce8643742ad6bb8510..8ad69652eabdd22175ff99c6e3ffdd16f7f648d4 100644 (file)
--- a/jjb/yangtools/yangtools-patch-test.yaml
+++ b/jjb/yangtools/yangtools-patch-test.yaml
@@ -4,33 +4,33 @@
     jobs:
       - inttest-patch-test
 
     jobs:
       - inttest-patch-test
 

-    project: 'yangtools'
+    project: "yangtools"

 
     stream:
       - silicon:
 
     stream:
       - silicon:

-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "master"
+          jre: "openjdk11"

       - aluminium:
       - aluminium:

-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
+          branch: "stable/aluminium"
+          jre: "openjdk11"

       - magnesium:
       - magnesium:

-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"

       - sodium:
       - sodium:

-          branch: 'stable/sodium'
+          branch: "stable/sodium"

 
 

-    os-branch: 'queens'
-    jdk: 'openjdk8'
+    os-branch: "queens"
+    jdk: "openjdk8"

 
     feature:
       - netvirt:
           csit-list: >
 
     feature:
       - netvirt:
           csit-list: >

-              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - cluster-netvirt:
           csit-list: >
 
       - cluster-netvirt:
           csit-list: >

-              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+            netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}

 
       - genius:
           csit-list: >
 
       - genius:
           csit-list: >

-              genius-csit-1node-gate-only-{stream}
+            genius-csit-1node-gate-only-{stream}

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 65e7a760f3f66878483c355a3f9f605a0952783c..9565ca6ba8422ea89a9a01bc0dd129559fc82eac 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -10,19 +10,19 @@
     branch: master
     stream: master
 
     branch: master
     stream: master
 

-    java-version: 'openjdk11'
-    mvn-settings: 'yangtools-settings'
+    java-version: "openjdk11"
+    mvn-settings: "yangtools-settings"

     mvn-version: mvn36
 
     mvn-version: mvn36
 

-    dependencies: ''
-    email-upstream: '[yangtools]'
+    dependencies: ""
+    email-upstream: "[yangtools]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d


@@ -38,18 +38,18 @@
     branch: 4.0.x
     stream: 4.0.x
 
     branch: 4.0.x
     stream: 4.0.x
 

-    java-version: 'openjdk11'
-    mvn-settings: 'yangtools-settings'
+    java-version: "openjdk11"
+    mvn-settings: "yangtools-settings"

 
 

-    dependencies: ''
-    email-upstream: '[yangtools]'
+    dependencies: ""
+    email-upstream: "[yangtools]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d


@@ -65,18 +65,18 @@
     branch: v3.0.x
     stream: v3.0.x
 
     branch: v3.0.x
     stream: v3.0.x
 

-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "yangtools-settings"
+    mvn-opts: "-Xmx1024m"

 
 

-    dependencies: ''
-    email-upstream: '[yangtools]'
+    dependencies: ""
+    email-upstream: "[yangtools]"

     archive-artifacts: >
     archive-artifacts: >

-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml

 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d


@@ -101,16 +101,16 @@
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
 
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
 

-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "yangtools"
+    project-name: "yangtools"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "yangtools-settings"
+    mvn-opts: "-Xmx1024m"

     sonarcloud: true
     sonarcloud: true

-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

 
 - project:
     name: yangtools-info
 
 - project:
     name: yangtools-info

diff --git a/openstack-hot/apex-server.yaml b/openstack-hot/apex-server.yaml
index 6a483c63e00729c59f969f113814a7787a162141..98049274795b0e36d9b7339c1ca1f71e7694560e 100644 (file)
--- a/openstack-hot/apex-server.yaml
+++ b/openstack-hot/apex-server.yaml
@@ -2,54 +2,54 @@
 heat_template_version: 2016-04-08
 
 parameters:
 heat_template_version: 2016-04-08
 
 parameters:

-    job_name:
-        type: string
-        description: Name of job running this template
-    silo:
-        type: string
-        default: vm
-        description: |
-            String to identify a Jenkins Master
+  job_name:
+    type: string
+    description: Name of job running this template
+  silo:
+    type: string
+    default: vm
+    description: |
+      String to identify a Jenkins Master

 
 

-            Useful in scenarios where multiple Jenkins Masters might be
-            creating VMs in the same cloud to uniquely distinguish them.
+      Useful in scenarios where multiple Jenkins Masters might be
+      creating VMs in the same cloud to uniquely distinguish them.

 
 

-            TODO we should move to using tags once OpenStack Ocata which is
-            available to us with support for server tags properties.
-    index:
-        type: number
-    group:
-        type: number
-        default: "0"
-    vm_flavor:
-        type: string
-        default: v1-standard-4
-        description: OpenStack Flavor to use
-    vm_image:
-        type: string
-        description: VM Image to spin up
-    vm_network:
-        type: string
-        description: VM network
+      TODO we should move to using tags once OpenStack Ocata which is
+      available to us with support for server tags properties.
+  index:
+    type: number
+  group:
+    type: number
+    default: "0"
+  vm_flavor:
+    type: string
+    default: v1-standard-4
+    description: OpenStack Flavor to use
+  vm_image:
+    type: string
+    description: VM Image to spin up
+  vm_network:
+    type: string
+    description: VM network

 
 resources:
 
 resources:

-    instance:
-        type: "OS::Nova::Server"
-        properties:
-            image: {get_param: vm_image}
-            flavor: {get_param: vm_flavor}
-            name:
-                str_replace:
-                    template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
-                    params:
-                        "SILO": {get_param: silo}
-                        "JOB_NAME": {get_param: job_name}
-                        "VM_TYPE":
-                            str_split:
-                                - ' - '
-                                - {get_param: vm_image}
-                                - 2
-                        "GROUP": {get_param: group}
-                        "INDEX": {get_param: index}
-            networks:
-                - network: {get_param: vm_network}
+  instance:
+    type: "OS::Nova::Server"
+    properties:
+      image: { get_param: vm_image }
+      flavor: { get_param: vm_flavor }
+      name:
+        str_replace:
+          template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
+          params:
+            "SILO": { get_param: silo }
+            "JOB_NAME": { get_param: job_name }
+            "VM_TYPE":
+              str_split:
+                - " - "
+                - { get_param: vm_image }
+                - 2
+            "GROUP": { get_param: group }
+            "INDEX": { get_param: index }
+      networks:
+        - network: { get_param: vm_network }

diff --git a/openstack-hot/csit-2-instance-type.yaml b/openstack-hot/csit-2-instance-type.yaml
index c813ceeea4f2c0d7d586da6efc89e4e5bba33111..b601d9c2f1de645e97ff4e666b5e9c6b51199cdc 100644 (file)
--- a/openstack-hot/csit-2-instance-type.yaml
+++ b/openstack-hot/csit-2-instance-type.yaml
@@ -2,68 +2,68 @@
 heat_template_version: 2016-04-08
 
 parameters:
 heat_template_version: 2016-04-08
 
 parameters:

-    job_name:
-        type: string
-        description: Name of job running this template
-    silo:
-        type: string
-        description: Jenkins Silo job is running in (typically releng|sandbox)
-    vm_0_count:
-        type: number
-        description: Number of VMs for 1st VM type
-    vm_0_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 1st VM type
-    vm_0_image:
-        type: string
-        description: Image to run instance on for 1st VM type
-    vm_1_count:
-        type: number
-        description: Number of VMs for 2nd VM type
-    vm_1_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 2nd VM type
-    vm_1_image:
-        type: string
-        description: Image to run instance on for 2nd VM type
+  job_name:
+    type: string
+    description: Name of job running this template
+  silo:
+    type: string
+    description: Jenkins Silo job is running in (typically releng|sandbox)
+  vm_0_count:
+    type: number
+    description: Number of VMs for 1st VM type
+  vm_0_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 1st VM type
+  vm_0_image:
+    type: string
+    description: Image to run instance on for 1st VM type
+  vm_1_count:
+    type: number
+    description: Number of VMs for 2nd VM type
+  vm_1_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 2nd VM type
+  vm_1_image:
+    type: string
+    description: Image to run instance on for 2nd VM type

 
 resources:
 
 resources:

-    vm_0_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_0_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_0_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_0_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "0"
-                    vm_flavor: {get_param: vm_0_flavor}
-                    vm_image: {get_param: vm_0_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "0"
+          vm_flavor: { get_param: vm_0_flavor }
+          vm_image: { get_param: vm_0_image }

 
 

-    vm_1_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_1_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_1_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_1_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "1"
-                    vm_flavor: {get_param: vm_1_flavor}
-                    vm_image: {get_param: vm_1_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "1"
+          vm_flavor: { get_param: vm_1_flavor }
+          vm_image: { get_param: vm_1_image }

 
 outputs:
 
 outputs:

-    vm_0_ips:
-        description: IP addresses of the 1st vm types
-        value: {get_attr: [vm_0_group, ip]}
-    vm_1_ips:
-        description: IP addresses of the 2nd vm types
-        value: {get_attr: [vm_1_group, ip]}
+  vm_0_ips:
+    description: IP addresses of the 1st vm types
+    value: { get_attr: [vm_0_group, ip] }
+  vm_1_ips:
+    description: IP addresses of the 2nd vm types
+    value: { get_attr: [vm_1_group, ip] }

diff --git a/openstack-hot/csit-3-instance-type.yaml b/openstack-hot/csit-3-instance-type.yaml
index de6548a3406e1838b0a69149ca0418e1b5798c70..421b3ff2f97ac2b46cb47d2e1c0531f5498833ee 100644 (file)
--- a/openstack-hot/csit-3-instance-type.yaml
+++ b/openstack-hot/csit-3-instance-type.yaml
@@ -2,95 +2,95 @@
 heat_template_version: 2016-04-08
 
 parameters:
 heat_template_version: 2016-04-08
 
 parameters:

-    job_name:
-        type: string
-        description: Name of job running this template
-    silo:
-        type: string
-        description: Jenkins Silo job is running in (typically releng|sandbox)
-    vm_0_count:
-        type: number
-        description: Number of VMs for 1st VM type
-    vm_0_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 1st VM type
-    vm_0_image:
-        type: string
-        description: Image to run instance on for 1st VM type
-    vm_1_count:
-        type: number
-        description: Number of VMs for 2nd VM type
-    vm_1_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 2nd VM type
-    vm_1_image:
-        type: string
-        description: Image to run instance on for 2nd VM type
-    vm_2_count:
-        type: number
-        description: Number of VMs for 3rd VM type
-    vm_2_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 3rd VM type
-    vm_2_image:
-        type: string
+  job_name:
+    type: string
+    description: Name of job running this template
+  silo:
+    type: string
+    description: Jenkins Silo job is running in (typically releng|sandbox)
+  vm_0_count:
+    type: number
+    description: Number of VMs for 1st VM type
+  vm_0_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 1st VM type
+  vm_0_image:
+    type: string
+    description: Image to run instance on for 1st VM type
+  vm_1_count:
+    type: number
+    description: Number of VMs for 2nd VM type
+  vm_1_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 2nd VM type
+  vm_1_image:
+    type: string
+    description: Image to run instance on for 2nd VM type
+  vm_2_count:
+    type: number
+    description: Number of VMs for 3rd VM type
+  vm_2_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 3rd VM type
+  vm_2_image:
+    type: string

 
 resources:
 
 resources:

-    vm_0_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_0_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_0_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_0_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "0"
-                    vm_flavor: {get_param: vm_0_flavor}
-                    vm_image: {get_param: vm_0_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "0"
+          vm_flavor: { get_param: vm_0_flavor }
+          vm_image: { get_param: vm_0_image }

 
 

-    vm_1_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_1_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_1_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_1_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "1"
-                    vm_flavor: {get_param: vm_1_flavor}
-                    vm_image: {get_param: vm_1_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "1"
+          vm_flavor: { get_param: vm_1_flavor }
+          vm_image: { get_param: vm_1_image }

 
 

-    vm_2_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_2_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_2_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_2_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "2"
-                    vm_flavor: {get_param: vm_2_flavor}
-                    vm_image: {get_param: vm_2_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "2"
+          vm_flavor: { get_param: vm_2_flavor }
+          vm_image: { get_param: vm_2_image }

 
 outputs:
 
 outputs:

-    vm_0_ips:
-        description: IP addresses of the 1st vm types
-        value: {get_attr: [vm_0_group, ip]}
-    vm_1_ips:
-        description: IP addresses of the 2nd vm types
-        value: {get_attr: [vm_1_group, ip]}
-    vm_2_ips:
-        description: IP addresses of the 3rd vm types
-        value: {get_attr: [vm_2_group, ip]}
+  vm_0_ips:
+    description: IP addresses of the 1st vm types
+    value: { get_attr: [vm_0_group, ip] }
+  vm_1_ips:
+    description: IP addresses of the 2nd vm types
+    value: { get_attr: [vm_1_group, ip] }
+  vm_2_ips:
+    description: IP addresses of the 3rd vm types
+    value: { get_attr: [vm_2_group, ip] }

diff --git a/openstack-hot/csit-4-instance-type.yaml b/openstack-hot/csit-4-instance-type.yaml
index 18ae037e5c60c612ab41e8cf24be54ca169f0ba3..e7ca5a26561afcaa57116de922d15718d47855f2 100644 (file)
--- a/openstack-hot/csit-4-instance-type.yaml
+++ b/openstack-hot/csit-4-instance-type.yaml
@@ -2,121 +2,121 @@
 heat_template_version: 2016-04-08
 
 parameters:
 heat_template_version: 2016-04-08
 
 parameters:

-    job_name:
-        type: string
-        description: Name of job running this template
-    silo:
-        type: string
-        description: Jenkins Silo job is running in (typically releng|sandbox)
-    vm_0_count:
-        type: number
-        description: Number of VMs for 1st VM type
-    vm_0_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 1st VM type
-    vm_0_image:
-        type: string
-        description: Image to run instance on for 1st VM type
-    vm_1_count:
-        type: number
-        description: Number of VMs for 2nd VM type
-    vm_1_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 2nd VM type
-    vm_1_image:
-        type: string
-        description: Image to run instance on for 2nd VM type
-    vm_2_count:
-        type: number
-        description: Number of VMs for 3rd VM type
-    vm_2_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 3rd VM type
-    vm_2_image:
-        type: string
-    vm_3_count:
-        type: number
-        description: Number of VMs for 3rd VM type
-    vm_3_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 3rd VM type
-    vm_3_image:
-        type: string
+  job_name:
+    type: string
+    description: Name of job running this template
+  silo:
+    type: string
+    description: Jenkins Silo job is running in (typically releng|sandbox)
+  vm_0_count:
+    type: number
+    description: Number of VMs for 1st VM type
+  vm_0_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 1st VM type
+  vm_0_image:
+    type: string
+    description: Image to run instance on for 1st VM type
+  vm_1_count:
+    type: number
+    description: Number of VMs for 2nd VM type
+  vm_1_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 2nd VM type
+  vm_1_image:
+    type: string
+    description: Image to run instance on for 2nd VM type
+  vm_2_count:
+    type: number
+    description: Number of VMs for 3rd VM type
+  vm_2_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 3rd VM type
+  vm_2_image:
+    type: string
+  vm_3_count:
+    type: number
+    description: Number of VMs for 3rd VM type
+  vm_3_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 3rd VM type
+  vm_3_image:
+    type: string

 
 resources:
 
 resources:

-    vm_0_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_0_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_0_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_0_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "0"
-                    vm_flavor: {get_param: vm_0_flavor}
-                    vm_image: {get_param: vm_0_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "0"
+          vm_flavor: { get_param: vm_0_flavor }
+          vm_image: { get_param: vm_0_image }

 
 

-    vm_1_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_1_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_1_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_1_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "1"
-                    vm_flavor: {get_param: vm_1_flavor}
-                    vm_image: {get_param: vm_1_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "1"
+          vm_flavor: { get_param: vm_1_flavor }
+          vm_image: { get_param: vm_1_image }

 
 

-    vm_2_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_2_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_2_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_2_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "2"
-                    vm_flavor: {get_param: vm_2_flavor}
-                    vm_image: {get_param: vm_2_image}
-    vm_3_group:
-        type: "OS::Heat::ResourceGroup"
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "2"
+          vm_flavor: { get_param: vm_2_flavor }
+          vm_image: { get_param: vm_2_image }
+  vm_3_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_3_count }
+      resource_def:
+        type: generic-server.yaml

         properties:
         properties:

-            count: {get_param: vm_3_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    group: "3"
-                    vm_flavor: {get_param: vm_3_flavor}
-                    vm_image: {get_param: vm_3_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "3"
+          vm_flavor: { get_param: vm_3_flavor }
+          vm_image: { get_param: vm_3_image }

 
 outputs:
 
 outputs:

-    vm_0_ips:
-        description: IP addresses of the 1st vm types
-        value: {get_attr: [vm_0_group, ip]}
-    vm_1_ips:
-        description: IP addresses of the 2nd vm types
-        value: {get_attr: [vm_1_group, ip]}
-    vm_2_ips:
-        description: IP addresses of the 3rd vm types
-        value: {get_attr: [vm_2_group, ip]}
-    vm_3_ips:
-        description: IP addresses of the 4th vm types
-        value: {get_attr: [vm_3_group, ip]}
+  vm_0_ips:
+    description: IP addresses of the 1st vm types
+    value: { get_attr: [vm_0_group, ip] }
+  vm_1_ips:
+    description: IP addresses of the 2nd vm types
+    value: { get_attr: [vm_1_group, ip] }
+  vm_2_ips:
+    description: IP addresses of the 3rd vm types
+    value: { get_attr: [vm_2_group, ip] }
+  vm_3_ips:
+    description: IP addresses of the 4th vm types
+    value: { get_attr: [vm_3_group, ip] }

diff --git a/openstack-hot/csit-apex-3-instance-type.yaml b/openstack-hot/csit-apex-3-instance-type.yaml
index 69010321d3020efb6ba2952efb996a3f27813ee0..8525765704eeb82dfa982a15b8e5191aad3393d0 100644 (file)
--- a/openstack-hot/csit-apex-3-instance-type.yaml
+++ b/openstack-hot/csit-apex-3-instance-type.yaml
@@ -2,114 +2,114 @@
 heat_template_version: 2016-04-08
 
 parameters:
 heat_template_version: 2016-04-08
 
 parameters:

-    job_name:
-        type: string
-        description: Name of job running this template
-    silo:
-        type: string
-        description: Jenkins Silo job is running in (typically releng|sandbox)
-    vm_0_count:
-        type: number
-        description: Number of VMs for 1st VM type
-    vm_0_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 1st VM type
-    vm_0_image:
-        type: string
-        description: Image to run instance on for 1st VM type
-    vm_1_count:
-        type: number
-        description: Number of VMs for 2nd VM type
-    vm_1_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 2nd VM type
-    vm_1_image:
-        type: string
-        description: Image to run instance on for 2nd VM type
-    vm_2_count:
-        type: number
-        description: Number of VMs for 3rd VM type
-    vm_2_flavor:
-        type: string
-        default: v1-standard-1
-        description: Flavor to run instance on for 3rd VM type
-    vm_2_image:
-        type: string
-        description: Image to run instance on for 3rd VM type
+  job_name:
+    type: string
+    description: Name of job running this template
+  silo:
+    type: string
+    description: Jenkins Silo job is running in (typically releng|sandbox)
+  vm_0_count:
+    type: number
+    description: Number of VMs for 1st VM type
+  vm_0_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 1st VM type
+  vm_0_image:
+    type: string
+    description: Image to run instance on for 1st VM type
+  vm_1_count:
+    type: number
+    description: Number of VMs for 2nd VM type
+  vm_1_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 2nd VM type
+  vm_1_image:
+    type: string
+    description: Image to run instance on for 2nd VM type
+  vm_2_count:
+    type: number
+    description: Number of VMs for 3rd VM type
+  vm_2_flavor:
+    type: string
+    default: v1-standard-1
+    description: Flavor to run instance on for 3rd VM type
+  vm_2_image:
+    type: string
+    description: Image to run instance on for 3rd VM type

 
 resources:
 
 resources:

-    192_network:
-        type: OS::Neutron::Net
-        properties:
-            name:
-                str_replace:
-                    template: SILO-JOB_NAME-NET
-                    params:
-                        "SILO": {get_param: silo}
-                        "JOB_NAME": {get_param: job_name}
-                        "NET": 'APEX_192_network'
-            port_security_enabled: false
+  192_network:
+    type: OS::Neutron::Net
+    properties:
+      name:
+        str_replace:
+          template: SILO-JOB_NAME-NET
+          params:
+            "SILO": { get_param: silo }
+            "JOB_NAME": { get_param: job_name }
+            "NET": "APEX_192_network"
+      port_security_enabled: false

 
 

-    192_subnet:
-        type: OS::Neutron::Subnet
-        properties:
-            name:
-                str_replace:
-                    template: SILO-JOB_NAME-SUBNET
-                    params:
-                        "SILO": {get_param: silo}
-                        "JOB_NAME": {get_param: job_name}
-                        "SUBNET": 'APEX_192_subnet'
-            network_id: {get_resource: 192_network}
-            cidr: 192.0.2.0/24
-            gateway_ip: 192.0.2.1
-            allocation_pools:
-                - start: 192.0.2.51
-                  end: 192.0.2.99
+  192_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name:
+        str_replace:
+          template: SILO-JOB_NAME-SUBNET
+          params:
+            "SILO": { get_param: silo }
+            "JOB_NAME": { get_param: job_name }
+            "SUBNET": "APEX_192_subnet"
+      network_id: { get_resource: 192_network }
+      cidr: 192.0.2.0/24
+      gateway_ip: 192.0.2.1
+      allocation_pools:
+        - start: 192.0.2.51
+          end: 192.0.2.99

 
 

-    vm_0_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_0_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_0_count }
+      resource_def:
+        type: apex-server.yaml

         properties:
         properties:

-            count: {get_param: vm_0_count}
-            resource_def:
-                type: apex-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    index: "%index%"
-                    group: "0"
-                    vm_flavor: {get_param: vm_0_flavor}
-                    vm_image: {get_param: vm_0_image}
-                    vm_network: {get_resource: 192_network}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          index: "%index%"
+          group: "0"
+          vm_flavor: { get_param: vm_0_flavor }
+          vm_image: { get_param: vm_0_image }
+          vm_network: { get_resource: 192_network }

 
 

-    vm_1_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_1_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_1_count }
+      resource_def:
+        type: apex-server.yaml

         properties:
         properties:

-            count: {get_param: vm_1_count}
-            resource_def:
-                type: apex-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    index: "%index%"
-                    group: "1"
-                    vm_flavor: {get_param: vm_1_flavor}
-                    vm_image: {get_param: vm_1_image}
-                    vm_network: {get_resource: 192_network}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          index: "%index%"
+          group: "1"
+          vm_flavor: { get_param: vm_1_flavor }
+          vm_image: { get_param: vm_1_image }
+          vm_network: { get_resource: 192_network }

 
 

-    vm_2_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_2_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_2_count }
+      resource_def:
+        type: apex-server.yaml

         properties:
         properties:

-            count: {get_param: vm_2_count}
-            resource_def:
-                type: apex-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    index: "%index%"
-                    group: "2"
-                    vm_flavor: {get_param: vm_2_flavor}
-                    vm_image: {get_param: vm_2_image}
-                    vm_network: {get_resource: 192_network}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          index: "%index%"
+          group: "2"
+          vm_flavor: { get_param: vm_2_flavor }
+          vm_image: { get_param: vm_2_image }
+          vm_network: { get_resource: 192_network }

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index 68fe7493778f50627c539f2f7bac7730d5df7ee5..223e33b78cbe59011dfdea06e5e550602d3e917a 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -2,74 +2,74 @@
 heat_template_version: 2016-04-08
 
 parameters:
 heat_template_version: 2016-04-08
 
 parameters:

-    job_name:
-        type: string
-        description: Name of job running this template
-    silo:
-        type: string
-        default: vm
-        description: |
-            String to identify a Jenkins Master
+  job_name:
+    type: string
+    description: Name of job running this template
+  silo:
+    type: string
+    default: vm
+    description: |
+      String to identify a Jenkins Master

 
 

-            Useful in scenarios where multiple Jenkins Masters might be
-            creating VMs in the same cloud to uniquely distinguish them.
+      Useful in scenarios where multiple Jenkins Masters might be
+      creating VMs in the same cloud to uniquely distinguish them.

 
 

-            TODO we should move to using tags once OpenStack Ocata which is
-            available to us with support for server tags properties.
-    ssh_key:
-        type: string
-        description: SSH Key name to use (Public key must exist in OpenStack)
-    index:
-        type: number
-    group:
-        type: number
-        default: "0"
-    vm_flavor:
-        type: string
-        default: v1-standard-1
-        description: OpenStack Flavor to use
-    vm_image:
-        type: string
-        description: VM Image to spin up
+      TODO we should move to using tags once OpenStack Ocata which is
+      available to us with support for server tags properties.
+  ssh_key:
+    type: string
+    description: SSH Key name to use (Public key must exist in OpenStack)
+  index:
+    type: number
+  group:
+    type: number
+    default: "0"
+  vm_flavor:
+    type: string
+    default: v1-standard-1
+    description: OpenStack Flavor to use
+  vm_image:
+    type: string
+    description: VM Image to spin up

 
 resources:
 
 resources:

-    port:
-        type: "OS::Neutron::Port"
-        properties:
-            allowed_address_pairs:
-                - ip_address: 10.250.0.0/24
-            network: odlci
-    instance:
-        type: "OS::Nova::Server"
-        properties:
-            image: {get_param: vm_image}
-            flavor: {get_param: vm_flavor}
-            name:
-                str_replace:
-                    template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
-                    params:
-                        "SILO": {get_param: silo}
-                        "JOB_NAME": {get_param: job_name}
-                        "VM_TYPE":
-                            str_split:
-                                - ' - '
-                                - {get_param: vm_image}
-                                - 2
-                        "GROUP": {get_param: group}
-                        "INDEX": {get_param: index}
-            networks:
-                - port: {get_resource: port}
-            key_name: {get_param: ssh_key}
-            user_data: |
-                #!/bin/bash
-                until host devvexx.opendaylight.org &>/dev/null
-                do
-                    echo "Waiting until devvexx.opendaylight.org is resolvable..."
-                done
-                git clone --recurse-submodules git://devvexx.opendaylight.org/mirror/releng/builder /opt/ciman
-                /opt/ciman/jjb/global-jjb/jenkins-init-scripts/init.sh
+  port:
+    type: "OS::Neutron::Port"
+    properties:
+      allowed_address_pairs:
+        - ip_address: 10.250.0.0/24
+      network: odlci
+  instance:
+    type: "OS::Nova::Server"
+    properties:
+      image: { get_param: vm_image }
+      flavor: { get_param: vm_flavor }
+      name:
+        str_replace:
+          template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
+          params:
+            "SILO": { get_param: silo }
+            "JOB_NAME": { get_param: job_name }
+            "VM_TYPE":
+              str_split:
+                - " - "
+                - { get_param: vm_image }
+                - 2
+            "GROUP": { get_param: group }
+            "INDEX": { get_param: index }
+      networks:
+        - port: { get_resource: port }
+      key_name: { get_param: ssh_key }
+      user_data: |
+        #!/bin/bash
+        until host devvexx.opendaylight.org &>/dev/null
+        do
+            echo "Waiting until devvexx.opendaylight.org is resolvable..."
+        done
+        git clone --recurse-submodules git://devvexx.opendaylight.org/mirror/releng/builder /opt/ciman
+        /opt/ciman/jjb/global-jjb/jenkins-init-scripts/init.sh

 
 outputs:
 
 outputs:

-    ip:
-        description: IP address of the instance
-        value: {get_attr: [instance, networks, odlci, 0]}
+  ip:
+    description: IP address of the instance
+    value: { get_attr: [instance, networks, odlci, 0] }

diff --git a/packer/README.markdown b/packer/README.markdown
index 1c60d44f221d3a08fbb1c77888a67a3577d67a74..da99a245788dfebf7bc9d4071cfb314983d5e844 100644 (file)
--- a/packer/README.markdown
+++ b/packer/README.markdown
@@ -26,12 +26,12 @@ Rackspace's Public cloud and a private OpenStack cloud.
 
 From a high level, the builds:
 
 
 From a high level, the builds:
 

-* Boot a specified base image in both clouds.
-* Run a set of shell scripts, listed in the template's shell provisioner
-  section, to do any configuration required by the builder.
-* Execute a shutdown of the running instance in the clouds.
-* Execute a 'nova image-create' operation against the shutdown instance.
-* Perform a 'nova delete' operation against the shutdown instance.
+-   Boot a specified base image in both clouds.
+-   Run a set of shell scripts, listed in the template's shell provisioner
+    section, to do any configuration required by the builder.
+-   Execute a shutdown of the running instance in the clouds.
+-   Execute a 'nova image-create' operation against the shutdown instance.
+-   Perform a 'nova delete' operation against the shutdown instance.

 
 [1]: https://www.packer.io/
 [2]: https://www.packer.io/intro/getting-started/setup.html
 
 [1]: https://www.packer.io/
 [2]: https://www.packer.io/intro/getting-started/setup.html

diff --git a/packer/provision/devstack-pre-pip.yaml b/packer/provision/devstack-pre-pip.yaml
index baa339c0dc36805fe3f07a6488d2b2ec37aed651..65566d3538e5a978281928e7bf6d30ab9c780f4f 100644 (file)
--- a/packer/provision/devstack-pre-pip.yaml
+++ b/packer/provision/devstack-pre-pip.yaml
@@ -9,7 +9,7 @@
     - include_role: name=lfit.system-update
 
   tasks:
     - include_role: name=lfit.system-update
 
   tasks:

-    - name: 'Install devstack dependencies'
+    - name: "Install devstack dependencies"

       block:
         - name: Install xpath dependencies
           yum:
       block:
         - name: Install xpath dependencies
           yum:


@@ -54,7 +54,7 @@
               - libmlx5
             state: present
           become: true
               - libmlx5
             state: present
           become: true

-    - name: 'Pre-Install yum and pip packages'
+    - name: "Pre-Install yum and pip packages"

       block:
         - name: Create /tmp/devstack directory
           file:
       block:
         - name: Create /tmp/devstack directory
           file:


@@ -65,7 +65,7 @@
           git:
             repo: https://github.com/openstack-dev/devstack.git
             dest: /tmp/devstack
           git:
             repo: https://github.com/openstack-dev/devstack.git
             dest: /tmp/devstack

-            version: '{{ os_branch }}'
+            version: "{{ os_branch }}"

         - name: "Read openstack devstack dependencies"
           shell: "sed -e 's/#.*//' /tmp/devstack/files/rpms/general"
           register: sed_output
         - name: "Read openstack devstack dependencies"
           shell: "sed -e 's/#.*//' /tmp/devstack/files/rpms/general"
           register: sed_output


@@ -78,8 +78,8 @@
           become: true
         - name: git clone openstack core projects
           git: repo='https://github.com/openstack/{{ item }}.git'
           become: true
         - name: git clone openstack core projects
           git: repo='https://github.com/openstack/{{ item }}.git'

-               dest='/tmp/devstack/{{ item }}'
-               version='{{ os_branch }}'
+            dest='/tmp/devstack/{{ item }}'
+            version='{{ os_branch }}'

           with_items:
             - requirements
             - keystone
           with_items:
             - requirements
             - keystone


@@ -111,21 +111,21 @@
             - horizon
           become: true
 
             - horizon
           become: true
 

-    - name: 'Install openvswitch from relevant openstack branch'
+    - name: "Install openvswitch from relevant openstack branch"

       block:
       block:

-        - name: 'Install CentOS openstack release {{ rdo_branch }}'
+        - name: "Install CentOS openstack release {{ rdo_branch }}"

           yum:
           yum:

-            name: 'centos-release-openstack-{{ rdo_branch }}'
+            name: "centos-release-openstack-{{ rdo_branch }}"

             state: present
           become: true
             state: present
           become: true

-        - name: 'Install openvswitch 2.8.2 for stable/queens'
+        - name: "Install openvswitch 2.8.2 for stable/queens"

           yum:
             name: openvswitch-2.8.2-1.el7
             state: present
             disable_gpg_check: yes
           when: rdo_branch == 'queens'
           become: true
           yum:
             name: openvswitch-2.8.2-1.el7
             state: present
             disable_gpg_check: yes
           when: rdo_branch == 'queens'
           become: true

-        - name: 'Install openvswitch latest for stable/rocky'
+        - name: "Install openvswitch latest for stable/rocky"

           yum:
             name: openvswitch
             state: present
           yum:
             name: openvswitch
             state: present


@@ -144,7 +144,7 @@
           when: ansible_facts.packages['git2u'] is defined
       become: true
 
           when: ansible_facts.packages['git2u'] is defined
       become: true
 

-    - name: 'Cleanup devstack directory'
+    - name: "Cleanup devstack directory"

       block:
         - name: "Removing /tmp/devstack"
           file:
       block:
         - name: "Removing /tmp/devstack"
           file:

diff --git a/packer/provision/devstack.yaml b/packer/provision/devstack.yaml
index 46e41c68efb501e4598ded6dae062ec831791fa7..ecad96747d3a6075c7ffaefd6a6f6bce846577c3 100644 (file)
--- a/packer/provision/devstack.yaml
+++ b/packer/provision/devstack.yaml
@@ -9,7 +9,7 @@
     - include_role: name=lfit.system-update
 
   tasks:
     - include_role: name=lfit.system-update
 
   tasks:

-    - name: 'Install devstack dependencies'
+    - name: "Install devstack dependencies"

       block:
         - name: Install xpath dependencies
           yum:
       block:
         - name: Install xpath dependencies
           yum:

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 9bae2959a100325529a6b01ffa88bb02ff4e83b0..cb56f89c443fe7fcfbe06f7337b8366038d1a817 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -18,11 +18,11 @@
   tasks:
     - name: Install Cassandra Server
       block:
   tasks:
     - name: Install Cassandra Server
       block:

-        - name: 'Fetch Cassandra Server to /tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+        - name: "Fetch Cassandra Server to /tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz"

           get_url:
           get_url:

-            url: 'https://archive.apache.org/dist/cassandra/{{cassandra_version}}/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
-            dest: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
-            checksum: '{{cassandra_checksum}}'
+            url: "https://archive.apache.org/dist/cassandra/{{cassandra_version}}/apache-cassandra-{{cassandra_version}}-bin.tar.gz"
+            dest: "/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz"
+            checksum: "{{cassandra_checksum}}"

         - name: Make /tmp/cassandra directory
           file:
             path: /tmp/cassandra
         - name: Make /tmp/cassandra directory
           file:
             path: /tmp/cassandra


@@ -30,16 +30,16 @@
             mode: 0755
         - name: Untar Cassandra server to /tmp/cassandra
           unarchive:
             mode: 0755
         - name: Untar Cassandra server to /tmp/cassandra
           unarchive:

-            src: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+            src: "/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz"

             dest: /tmp/cassandra
             remote_src: true
     - name: Install Elastic Search
       block:
             dest: /tmp/cassandra
             remote_src: true
     - name: Install Elastic Search
       block:

-        - name: 'Fetch Elastic Search to /tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+        - name: "Fetch Elastic Search to /tmp/elasticsearch-{{elastic_search_version}}.tar.gz"

           get_url:
           get_url:

-            url: 'https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-{{elastic_search_version}}.tar.gz'
-            dest: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
-            checksum: '{{elastic_search_checksum}}'
+            url: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-{{elastic_search_version}}.tar.gz"
+            dest: "/tmp/elasticsearch-{{elastic_search_version}}.tar.gz"
+            checksum: "{{elastic_search_checksum}}"

         - name: Make /tmp/elasticsearch directory
           file:
             path: /tmp/elasticsearch
         - name: Make /tmp/elasticsearch directory
           file:
             path: /tmp/elasticsearch


@@ -47,16 +47,16 @@
             mode: 0755
         - name: Untar Elastic Search to /tmp/elasticsearch
           unarchive:
             mode: 0755
         - name: Untar Elastic Search to /tmp/elasticsearch
           unarchive:

-            src: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+            src: "/tmp/elasticsearch-{{elastic_search_version}}.tar.gz"

             dest: /tmp/elasticsearch
             remote_src: true
     - name: Install HBase Server
       block:
             dest: /tmp/elasticsearch
             remote_src: true
     - name: Install HBase Server
       block:

-        - name: 'Fetch HBase to /tmp/hbase-{{hbase_version}}.tar.gz'
+        - name: "Fetch HBase to /tmp/hbase-{{hbase_version}}.tar.gz"

           get_url:
           get_url:

-            url: 'https://archive.apache.org/dist/hbase/hbase-{{hbase_version}}/hbase-{{hbase_version}}.tar.gz'
-            dest: '/tmp/hbase-{{hbase_version}}.tar.gz'
-            checksum: '{{hbase_checksum}}'
+            url: "https://archive.apache.org/dist/hbase/hbase-{{hbase_version}}/hbase-{{hbase_version}}.tar.gz"
+            dest: "/tmp/hbase-{{hbase_version}}.tar.gz"
+            checksum: "{{hbase_checksum}}"

         - name: Make /tmp/Hbase directory
           file:
             path: /tmp/Hbase
         - name: Make /tmp/Hbase directory
           file:
             path: /tmp/Hbase


@@ -64,7 +64,7 @@
             mode: 0755
         - name: Untar Hbase to /tmp/Hbase
           unarchive:
             mode: 0755
         - name: Untar Hbase to /tmp/Hbase
           unarchive:

-            src: '/tmp/hbase-{{hbase_version}}.tar.gz'
+            src: "/tmp/hbase-{{hbase_version}}.tar.gz"

             dest: /tmp/Hbase
             remote_src: true
 
             dest: /tmp/Hbase
             remote_src: true
 

diff --git a/packer/provision/mininet-ovs-2.5.yaml b/packer/provision/mininet-ovs-2.5.yaml
index dd9cac260566c8cf3def663f00fa499e1fc728a0..53366c7ee860894c147c88da3558944fc2cd931b 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.yaml
+++ b/packer/provision/mininet-ovs-2.5.yaml
@@ -9,9 +9,9 @@
     - include_role: name=lfit.system-update
 
   tasks:
     - include_role: name=lfit.system-update
 
   tasks:

-    - name: 'Install OpenVSwitch {{ovs_version}}'
+    - name: "Install OpenVSwitch {{ovs_version}}"

       block:
       block:

-        - name: 'Install dependencies required for OpenVSwitch {{ovs_version}}'
+        - name: "Install dependencies required for OpenVSwitch {{ovs_version}}"

           apt:
             name:
               - dh-autoreconf
           apt:
             name:
               - dh-autoreconf


@@ -29,7 +29,7 @@
               - python-twisted-conch
             state: present
           become: true
               - python-twisted-conch
             state: present
           become: true

-        - name: 'Install OpenVSwitch {{ovs_version}}'
+        - name: "Install OpenVSwitch {{ovs_version}}"

           apt:
             name:
               - openvswitch-switch
           apt:
             name:
               - openvswitch-switch

diff --git a/packer/provision/mininet-ovs-2.6.yaml b/packer/provision/mininet-ovs-2.6.yaml
index 5e149c8a2a6d979c5344b424491ebceffcf3fc28..bb891443116b4400177a03500809892f5f8387d5 100644 (file)
--- a/packer/provision/mininet-ovs-2.6.yaml
+++ b/packer/provision/mininet-ovs-2.6.yaml
@@ -12,9 +12,9 @@
     - include_role: name=lfit.system-update
 
   tasks:
     - include_role: name=lfit.system-update
 
   tasks:

-    - name: 'Install OpenVSwitch {{ovs_version}}'
+    - name: "Install OpenVSwitch {{ovs_version}}"

       block:
       block:

-        - name: 'Install dependencies required for OpenVSwitch {{ovs_version}}'
+        - name: "Install dependencies required for OpenVSwitch {{ovs_version}}"

           apt:
             name:
               - dh-autoreconf
           apt:
             name:
               - dh-autoreconf


@@ -38,24 +38,24 @@
             state: directory
             mode: 0755
           become: true
             state: directory
             mode: 0755
           become: true

-        - name: 'Fetch OpenVSwitch {{ovs_version}} to /tmp'
+        - name: "Fetch OpenVSwitch {{ovs_version}} to /tmp"

           get_url:
           get_url:

-            url: 'http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz'
-            dest: '/tmp/openvswitch-2.6.1.tar.gz'
-            checksum: '{{ovs_checksum}}'
-        - name: 'Unarchive OpenVSwitch {{ovs_version}}'
+            url: "http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz"
+            dest: "/tmp/openvswitch-2.6.1.tar.gz"
+            checksum: "{{ovs_checksum}}"
+        - name: "Unarchive OpenVSwitch {{ovs_version}}"

           unarchive:
           unarchive:

-            src: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            src: "/tmp/openvswitch-{{ovs_version}}.tar.gz"

             dest: /opt/ovs
             remote_src: true
           become: true
             dest: /opt/ovs
             remote_src: true
           become: true

-        - name: 'Build OpenVSwitch {{ovs_version}}'
+        - name: "Build OpenVSwitch {{ovs_version}}"

           shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
           args:
           shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
           args:

-            chdir: '/opt/ovs/openvswitch-{{ovs_version}}'
+            chdir: "/opt/ovs/openvswitch-{{ovs_version}}"

           become: true
           become: true

-        - name: 'Install OpenVSwitch {{ovs_version}}'
-          apt: 'deb={{item}}'
+        - name: "Install OpenVSwitch {{ovs_version}}"
+          apt: "deb={{item}}"

           with_items:
             - /opt/ovs/openvswitch-common_2.6.1-1_amd64.deb
             - /opt/ovs/openvswitch-switch_2.6.1-1_amd64.deb
           with_items:
             - /opt/ovs/openvswitch-common_2.6.1-1_amd64.deb
             - /opt/ovs/openvswitch-switch_2.6.1-1_amd64.deb

diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml
index 06dc8c011a323c4a7babdbfd809357dfc45962b2..88c906578e4693a9490949bc5c323e2d56d681c0 100644 (file)
--- a/packer/provision/mininet-ovs-2.8.yaml
+++ b/packer/provision/mininet-ovs-2.8.yaml
@@ -12,7 +12,7 @@
     - include_role: name=lfit.system-update
 
   tasks:
     - include_role: name=lfit.system-update
 
   tasks:

-    - name: 'Install OpenVSwitch {{ovs_version}}'
+    - name: "Install OpenVSwitch {{ovs_version}}"

       block:
         - name: Install OpenVSwitch dependencies
           apt:
       block:
         - name: Install OpenVSwitch dependencies
           apt:


@@ -32,27 +32,27 @@
               - python-zopeinterface
             state: present
           become: true
               - python-zopeinterface
             state: present
           become: true

-        - name: 'Fetch OpenVSwitch {{ovs_version}}'
+        - name: "Fetch OpenVSwitch {{ovs_version}}"

           get_url:
           get_url:

-            url: 'http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz'
-            dest: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
-            checksum: '{{ovs_checksum}}'
+            url: "http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz"
+            dest: "/tmp/openvswitch-{{ovs_version}}.tar.gz"
+            checksum: "{{ovs_checksum}}"

         - name: Create /tmp/ovs directory
           file:
             path: /tmp/ovs
             state: directory
             mode: 0755
         - name: Create /tmp/ovs directory
           file:
             path: /tmp/ovs
             state: directory
             mode: 0755

-        - name: 'Unarchive OpenVSwitch {{ovs_version}}'
+        - name: "Unarchive OpenVSwitch {{ovs_version}}"

           unarchive:
           unarchive:

-            src: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            src: "/tmp/openvswitch-{{ovs_version}}.tar.gz"

             dest: /tmp/ovs
             remote_src: true
             dest: /tmp/ovs
             remote_src: true

-        - name: 'Build OpenVSwitch {{ovs_version}}'
+        - name: "Build OpenVSwitch {{ovs_version}}"

           shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
           args:
           shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
           args:

-            chdir: '/tmp/ovs/openvswitch-{{ovs_version}}'
-        - name: 'Install OpenVSwitch {{ovs_version}}'
-          apt: 'deb={{item}}'
+            chdir: "/tmp/ovs/openvswitch-{{ovs_version}}"
+        - name: "Install OpenVSwitch {{ovs_version}}"
+          apt: "deb={{item}}"

           with_items:
             - /tmp/ovs/libopenvswitch_2.8.1-1_amd64.deb
             - /tmp/ovs/openvswitch-common_2.8.1-1_amd64.deb
           with_items:
             - /tmp/ovs/libopenvswitch_2.8.1-1_amd64.deb
             - /tmp/ovs/openvswitch-common_2.8.1-1_amd64.deb

diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json
index c3b921de0609576fc13711801656837fcae0c8df..602ced538985da593817b5702476ce84e84a46c1 100644 (file)
--- a/packer/templates/devstack-pre-pip-queens.json
+++ b/packer/templates/devstack-pre-pip-queens.json
@@ -40,9 +40,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],

       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {

diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index 65171a716d8477c88f5742e56550e67655bfa79a..348d28e3a6fa8b85d505e66a2ca6647a134e7931 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.json
@@ -24,9 +24,7 @@
       "type": "openstack",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "type": "openstack",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",

-      "networks": [
-        "{{user `cloud_network`}}"
-      ],
+      "networks": ["{{user `cloud_network`}}"],

       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",


@@ -39,9 +37,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],

       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {

diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json
index 97e6f2e002c16699b0f0637f4183d32d7f20cb71..f2936434bbf4d6d265a97ccf1d92062926b349a8 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.json
+++ b/packer/templates/devstack-pre-pip-stein.json
@@ -40,9 +40,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],

       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index f65fc8431c7501981a350617e40d43879c94edbf..e461a9a24ab15d33e65fbcf8a885eba81f14b80e 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -40,9 +40,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],

       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {

diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
index 4ef3a9f943e7f570733b52916d335e2bb92612eb..84ebbbe57ab9c4a649e820b0b0ab038e150656e4 100644 (file)
--- a/packer/templates/gbp.json
+++ b/packer/templates/gbp.json
@@ -40,9 +40,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "inline": [
-        "mkdir -p /tmp/packer"
-      ]
+      "inline": ["mkdir -p /tmp/packer"]

     },
     {
       "type": "file",
     },
     {
       "type": "file",

diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index c41f0c95eee6d594f193b5b66a0d55c12c95ca5e..804a279e7c9e238f7522c36894c56d32d397dcb4 100644 (file)
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -40,9 +40,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],

       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {

diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json
index fa999a7f6f053f7883c97e5a3e79e1d9c697dea3..0a9e5fdec9129f40890e331693b27aaa449e129c 100644 (file)
--- a/packer/templates/mininet-ovs-2.6.json
+++ b/packer/templates/mininet-ovs-2.6.json
@@ -40,9 +40,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],

       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index c1d1fd3fbc95551576f059f67b3e127c8393020b..1b3a34f4b986bb8fcc29d447a3c0f6f4f42ca674 100644 (file)
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -40,9 +40,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],

       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index 9c0c63f3e7a0eeed1c1506e147f5f92a56ce5578..7adc08c7f56cbc216499f764474f66c657aefe9e 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -40,9 +40,7 @@
   "provisioners": [
     {
       "type": "shell",
   "provisioners": [
     {
       "type": "shell",

-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],

       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {