Merge "CI: Publish logs for bgp MRI jobs"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 19071f7c914f0f812cb86821204d15366251e8c9..734653f2dc41799d8d8be66e33344b7d1cbaaed0 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
           )$
 
   - repo: https://github.com/ambv/black
-    rev: 21.9b0
+    rev: 21.10b0
     hooks:
       - id: black
 

diff --git a/global-jjb b/global-jjb
index 599b705c033b73a5565027db210960ae7658f9f5..24d80c063923fc2ae4e76a5797ae471601c18569 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 599b705c033b73a5565027db210960ae7658f9f5
+Subproject commit 24d80c063923fc2ae4e76a5797ae471601c18569

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg
index c1594ff11d95db62494dfc0235a8298ee9bb4fe0..969f39e7e32f5518847cc3537bc21d200cba6428 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20210513-214525.779
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20211108-230947.651
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-4c-4g.cfg
new file mode 100644 (file)
index 0000000..73f12cf
--- /dev/null
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-helm-4c-4g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20211108-230947.651
+LABELS=ubuntu1804-helm-4c-4g
+HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml b/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml
new file mode 100644 (file)
index 0000000..d6dcf71
--- /dev/null
+++ b/jenkins-config/managed-config-files/custom/ansible-cfg/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "ansible.cfg"
+comment: "ansible config file"

diff --git a/jenkins-config/managed-config-files/custom/ansible-cfg/content b/jenkins-config/managed-config-files/custom/ansible-cfg/content
new file mode 100644 (file)
index 0000000..040c3d0
--- /dev/null
+++ b/jenkins-config/managed-config-files/custom/ansible-cfg/content
@@ -0,0 +1,2 @@
+[defaults]
+remote_tmp      = ~/.ansible/tmp

diff --git a/jenkins-config/managed-config-files/mavenSettings/packaging-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/packaging-settings/serverCredentialMappings.yaml
index 0253ecf3421105b3d24ecae570df525800cd0de3..3331b729a824959db5deaedd7c8fa7d2b759d5ae 100644 (file)
--- a/jenkins-config/managed-config-files/mavenSettings/packaging-settings/serverCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/mavenSettings/packaging-settings/serverCredentialMappings.yaml
@@ -10,3 +10,5 @@ serverCredentialMappings:
     credentialsId: *pkg-cred
   - serverId: "nexus3.opendaylight.org:10004"
     credentialsId: *pkg-cred
+  - serverId: "odl-helm-testing"
+    credentialsId: "odl-helm"

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 477735a4f9d52fcef0fc7946cec9ad065accbc84..328099652f0a7f74f673e780b8335932ed7b4f96 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -109,6 +109,7 @@
       - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
+          settings-project: integration
       - distribution-check-bootup
 
       - trigger-builds:
@@ -382,6 +383,7 @@
       - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: "{dist-pom}"
+          settings-project: integration
       - distribution-check-bootup
 
     publishers:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 4f4718e5d6d4711e1abf804719ab03dea283dc1a..1e2abb3f4d8c1bdf574a21ddb0efa3edfef828ba 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -469,7 +469,7 @@
           files:
             - file-id: global-settings
               variable: GLOBAL_SETTINGS_FILE
-            - file-id: integration-settings
+            - file-id: "{settings-project}-settings"
               variable: SETTINGS_FILE
       - integration-set-variables
       - inject:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index afbb5f4405ea6439cc1170a7dbfdf89dfdaeddd9..e2d8bc3d3b3e9375d44c84cc116ddc3fd4dea453 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1923,6 +1923,7 @@
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: "{project}/pom.xml"
+          settings-project: "{project}"
       - trigger-builds:
           - project: "{csit-list}"
             block: true
@@ -2040,6 +2041,7 @@
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
+          settings-project: integration
       - trigger-builds:
           - project: "{csit-list}"
             block: true

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 57d1c586eb8c53e5d78d5b03f0e852c41ae543fb..17eb89ccbb7d79507cb213241a196987c14c394b 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -347,6 +347,7 @@
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
+          settings-project: integration
       - trigger-builds:
           - project: "{csit-list}"
             block: true
@@ -447,6 +448,7 @@
       - integration-multipatch-builder
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml
+          settings-project: integration
       - conditional-step:
           condition-kind: boolean-expression
           condition-expression: $RUN_TEST

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index d3f638763438586860fc07c3212603a4d3c7f27d..2b3843413da43b1fbccd2f981d16b37b6c43aa69 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -18,7 +18,7 @@
     java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
     mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop
@@ -32,7 +32,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-7.0.x
+    name: mdsal-8.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -44,13 +44,13 @@
 
     project: mdsal
     project-name: mdsal
-    branch: 7.0.x
-    stream: 7.0.x
+    branch: 8.0.x
+    stream: 8.0.x
 
     java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
     mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop
@@ -64,7 +64,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-6.0.x
+    name: mdsal-7.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -76,13 +76,13 @@
 
     project: mdsal
     project-name: mdsal
-    branch: 6.0.x
-    stream: 6.0.x
+    branch: 7.0.x
+    stream: 7.0.x
 
     java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
     mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 84eede89ae0122597c6532d0e5176ad1e0763cab..fb554abcb2e84c4d00de1a6de5e98be8f5a543e5 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -51,20 +51,13 @@
 
     # Project branches
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
             \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-          robot-options:
-            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
-            \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
-            \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 365b96edc6b474a2be831f46946bab77e1330bd3..7f14b020dcd78b28a5f4a7ccf22791920b9e9811 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -34,6 +34,41 @@
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
+- project:
+    name: odlparent-9.0.x
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: odlparent
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
+          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 9.0.x
+    branch: 9.0.x
+
+    java-version: "openjdk11"
+    mvn-settings: odlparent-settings
+    mvn-version: mvn36
+
+    dependencies: ""
+    email-upstream: "[odlparent]"
+    archive-artifacts: >
+      **/*.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
+
 - project:
     name: odlparent-8.1.x
     jobs:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 9081ea0269eb22b475ddc9f780ac7802a468a2cb..296e03610136e6b1c487f283487ad0c230ea79ae 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -83,34 +83,6 @@
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-5.0.x
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: 5.0.x
-    stream: 5.0.x
-
-    java-version: "openjdk11"
-    mvn-settings: "yangtools-settings"
-    mvn-version: mvn36
-
-    dependencies: ""
-    email-upstream: "[yangtools]"
-    archive-artifacts: >
-      **/*.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
-
 - project:
     name: yangtools-release-management
     jobs:

diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 7b01c22037d0fb2eebb099afa96170294a2c4007..99dcda9475866694cc312495ce7e7316919a5c29 100644 (file)
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -24,7 +24,7 @@
       block:
         - name: "Fetch tar.gz for {{helm_version}}"
           get_url:
-            url: "http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz"
+            url: "https://get.helm.sh/helm-v{{helm_version}}-linux-amd64.tar.gz"
             dest: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz"
         - name: "Unarchive {{helm_version}}"
           unarchive: