Merge "Remove unused macros gpg-sig and jjbini"

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 0b4d4201ffc42e2ca7038eacfb975f73ffb78c87..6ec385a89e2b1fc38baa21c2f91e7bdc075bbbc9 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -387,7 +387,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**/*.xml'

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index d1771099eaae2678c6787592f23116e690934bc0..6ed120d9cef3beabe9155e7d31dae5d087161fa1 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -35,7 +35,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -106,7 +106,7 @@
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'integration/distribution'
           branch: '{branch}'
 
@@ -229,7 +229,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index f4791ba5c6879454a1fcd9bca6f561e1316fc4bd..a4cb1b8f694dc264911b8b0b77468c3e61a8a7bd 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -51,7 +51,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 00c2d8c9ee7946353a96912cb790508637cd7791..3409de3912ebbe7a9ffb8cd5f2d0390c9f401976 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -161,7 +161,7 @@
 # in order to prevent Jenkins from starting only a subset and still voting Verified+1.
 # Contrary to gerrit-trigger-patch-submitted, this votes +1 also on unstable runs.
 # Arguments:
-#     server: name of gerrit server to listen to
+#     gerrit-server-name: name of gerrit server to listen to
 #     project: pattern to match triggering projects
 #     branch: triggering branch name
 #     files: pattern to match triggering filepaths
@@ -169,7 +169,7 @@
     name: integration-trigger-patch-submitted
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 4d83eb20d626a003a2fc588f1cae4acba7c73907..8065f60e34ca995c5571e420aed41fa168c55f05 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -77,7 +77,7 @@
 
     triggers:
       - integration-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: 'integration/test'
           branch: 'master'
           files: 'csit/suites/{project}/**'
@@ -501,7 +501,7 @@
 
     triggers:
       - integration-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: 'integration/test'
           branch: 'master'
           files: 'csit/suites/{project}/**'
@@ -1427,7 +1427,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'test-{project}-all'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index cca3d2bee69a887ff98f87245f8aff872aa62efe..997d326921e4cf202890b5e0498e9c221b7da484 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -159,7 +159,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'test-integration'

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 94384bd04d8cf1da5d2c427f11b99c62bbf1030a..1ca3120834ef9be3fff38c8fa7dbb9aa1507a369 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -44,6 +44,21 @@
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
 
+- project:
+    name: lf-infra-docs-conf
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-docs-conf
+    project: releng/docs-conf
+    project-pattern: releng/docs-conf
+    build-node: centos7-java-builder-2c-4g
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
+
 - project:
     name: lf-infra-global-jjb
     jobs:

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index f3e2446a303fabe6ec88b0d2d8c543c2b6b5c314..c81a46d14baaeb865b28ee19fc84c53391981a26 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -167,7 +167,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index b6a3503248f824f88d382ab4012c85537077b618..e4b323e677a3ae41ac8b4641646b0bd550b40b80 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -41,6 +41,9 @@
       - snat-conntrack:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - cluster-snat-conntrack:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
       - l2gw:
           csit-list: >
               netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 7a228a46ce00092c35cb7a5b77faa20e88b73398..ffa23c14a1a4f2fc1bf08dd7736ae409e3af722c 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -72,7 +72,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -132,7 +132,7 @@
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'opflex'
           branch: '{branch}'
 

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index ad0238ba4698e7c922ceebcbdeb868c4e6cce195..affbfaf976480f84e3a56d999c74a64b2f8de51d 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -125,7 +125,7 @@
     triggers:
       - timed: '@midnight'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index fd529707c7b52e64430437fa8c848f987994d528..ce661a0ba41473d2eb6c4a73fc2b9ce8578ec16e 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -38,7 +38,7 @@
     triggers:
       - timed: '{schedule-saturday}'
       - gerrit-trigger-patch-sonar:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'ovsdb'
 
     builders:

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index f35433745b02e0899e12731332ec77f0807dfeb1..dcf221405e6bb85dec5aaf3abe7a261db730fc9b 100644 (file)
--- a/jjb/packaging/ansible.yaml
+++ b/jjb/packaging/ansible.yaml
@@ -49,7 +49,7 @@
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -92,7 +92,7 @@
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index cab68c051d10cf03d2ecf0719df0bcf19ced1e0d..f9a65428f07e672d415ffda28d1d017a5f67e249 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -209,7 +209,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -305,7 +305,7 @@
     triggers:
       - timed: '@daily'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'verify-rpm-full'

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index bdb56aaaa5fc106f21154784c409a5c4b06052fd..fa1eeb7eb1e42a850526a9f7c18f07b94ad2241d 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -57,7 +57,7 @@
     triggers:
       - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -104,7 +104,7 @@
     triggers:
       - timed: '@daily'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'puppet-test-full'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 7aada581a3a170f77d5cc7724e24ddafd142bb0e..1fa078c85f12b1854c5bff4233ffabf1a1b1edab 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -25,8 +25,6 @@
     # lf-infra defaults
     jenkins-ssh-credential: opendaylight-jenkins-ssh
     gerrit-server-name: OpenDaylight
-    # server-name is deprecated, use gerrit-server-name moving forward.
-    server-name: 'OpenDaylight'
     mvn-site-id: opendaylight-site
     mvn-staging-id: opendaylight-staging
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 968dee281cad396d9a3cdc51bc7aaba94f78e1fe..cd77391bced7efd77000fe3a561b19376aad48a0 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -174,7 +174,7 @@
 # Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs,
 # in order to prevent Jenkins from starting only a subset and still voting Verified+1.
 # Arguments:
-#     server: name of gerrit server to listen to
+#     gerrit-server-name: name of gerrit server to listen to
 #     project: pattern to match triggering projects
 #     branch: triggering branch name
 #     files: pattern to match triggering filepaths
@@ -182,7 +182,7 @@
     name: gerrit-trigger-patch-submitted
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
@@ -206,7 +206,7 @@
     name: gerrit-trigger-patch-merged
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
@@ -241,7 +241,7 @@
     name: gerrit-trigger-patch-sonar
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'run-sonar'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 81fb5033192110dd92dccac0940a201e52ee4f73..298be0d5b75a61c9ddb2cf4410fbf61401f6cfcd 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -96,7 +96,7 @@
     triggers:
       - timed: 'H H * * 0'
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
           branch: '{branch}'
 

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index c69711e8c5352b9bd64d59c65d984251cb4bab17..60bbb303757436a8cc7fc0c51ad2eceb496483c8 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -44,7 +44,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: 'sfc-py/**'

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 752779e5f769450783d35bd0fd5b13b4fb4c3cdb..6291f9490baf917612a785dbb61d87c1a76acae2 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -39,7 +39,7 @@
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'spectrometer'
           branch: 'master'
       - timed: '@daily'