Merge "Update cloud image CentOS7 docker x86_64"

diff --git a/global-jjb b/global-jjb
index de13320dea5c46324937b12f69435e082e4edf0b..d31ff4635d1dc4a6afe4cf3be622a219be5f1318 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit de13320dea5c46324937b12f69435e082e4edf0b
+Subproject commit d31ff4635d1dc4a6afe4cf3be622a219be5f1318

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 017caeb6164317540da33da4c37ee8f22d7c1f3d..28b38ea038d9a7b0d6fde665d4909945f2b69804 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -25,6 +25,32 @@
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
+- project:
+    name: controller-7.0.x
+    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/
+          rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    stream: 7.0.x
+    project: "controller"
+    project-name: "controller"
+    branch: 7.0.x
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-settings: "controller-settings"
+    mvn-goals: "clean deploy -Pdocs"
+    build-timeout: 90
+    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
+
 - project:
     name: controller-6.0.x
     jobs:

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 304d4b9f4cb7a81f6388c33114c2f74909858723..b0814ae96a6fb0f7131d5f30c27a2c1c357e8b68 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -9,7 +9,7 @@
       - potassium:
           branch: "master"
       - argon:
-          branch: "stable/master"
+          branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
 

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 6c967d0cb00c1d18940143b25126de8631bbcd8a..e0cab0203efe6fb2deed0e29cb332aa7b5d61240 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -916,9 +916,6 @@ fi
 
 FEATURE_TEST_STRING="features-test"
 FEATURE_TEST_VERSION="$BUNDLE_VERSION"
-if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then
-    FEATURE_TEST_VERSION="$(sed -r "s%^([0-9]+)\.([0-9]+)\.0(.*)%0.\1.\2\3%" <<<"$BUNDLE_VERSION")"
-fi
 KARAF_VERSION=${KARAF_VERSION:-karaf4}
 
 # only manipulate feature repo in integration distro

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index 2ae9b890593cf839effc2a6814babb200b9d4809..f346613e1972d151e71dc4b816c7e7a042f99074 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -37,9 +37,6 @@ echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
 FEATURE_TEST_STRING="features-test"
 FEATURE_TEST_VERSION="$BUNDLE_VERSION"
-if [ "$KARAF_ARTIFACT" = "opendaylight" ]; then
-    FEATURE_TEST_VERSION="$(echo "$BUNDLE_VERSION" | sed -E "s%^([0-9]+)\.([0-9]+)\.0(.*)%0.\1.\2\3%")"
-fi
 
 # only replace feature repo in integration/distro, MRI projects need to pull in
 # the features they need by themselves

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 1917bd1e53378ef651d7cd18d7382ef1a0d6955a..b9a5ab90e477e754e5f36d4dee031d32f0937d45 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -52,7 +52,7 @@
     email-upstream: "[int/dist]"
     type: managed
     profile: "-Pmanaged"
-    forbidden-files: '(opendaylight\/.*|docker\/.*)'
+    forbidden-files: '(docker\/.*)'
     java-version: "openjdk17"
     jre: "openjdk17"
     karaf-version: karaf4
@@ -87,84 +87,6 @@
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
 
-- 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}"
-
-    project: integration/distribution
-    project-name: distribution
-    build-node: centos8-builder-4c-4g
-    mvn-settings: integration-distribution-settings
-    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
-    mvn-opts: "-Xmx1024m"
-    mvn-version: mvn38
-    email-upstream: "[int/dist]"
-    type: full
-    profile: "-Punmanaged"
-    files: "opendaylight/**"
-    java-version: "openjdk17"
-    karaf-version: odl
-    dist-pom: "distribution/opendaylight/pom.xml"
-    stream:
-      - potassium:
-          branch: "master"
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - argon:
-          branch: "stable/argon"
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - chlorine:
-          branch: "stable/chlorine"
-          dependencies: >
-            distribution-merge-managed-{stream},
-
-- project:
-    name: distribution-release
-    jobs:
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          sbom-path: "opendaylight"
-
-    project: "integration/distribution"
-    project-name: "distribution"
-    build-node: centos8-builder-4c-4g
-    use-release-file: false
-    mvn-goals: "clean deploy -f opendaylight/pom.xml"
-    mvn-settings: "integration-distribution-settings"
-    mvn-opts: "-Xmx1024m"
-    mvn-version: mvn38
-    java-version: "openjdk17"
-    email-upstream: "[int/dist]"
-
-    # Used by the release job
-    staging-profile-id: 2af042ed81d5e2
-
-    stream:
-      - potassium:
-          branch: "master"
-      - argon:
-          branch: "stable/argon"
-      - chlorine:
-          branch: "stable/chlorine"
-
-- project:
-    name: distribution-release-management
-    jobs:
-      - gerrit-release-merge
-
-    project: "integration/distribution"
-    project-name: distribution
-
-    build-node: centos7-builder-2c-1g
-    mvn-settings: integration-distribution-settings
-    build-timeout: 60
-
 - project:
     name: distribution-sonar
     jobs:

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index e62fb572379ada7a5e5d93b854d612beed3557c6..e36be2b8825fd7fb716a84abddb23c59ffe39dd4 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -32,7 +32,7 @@
     build-node: centos8-builder-2c-2g
     archive-artifacts: "**/*.log"
     build-timeout: 30
-    jjb-version: 4.1.0
+    jjb-version: 5.0.2
 
 - project:
     name: builder-openstack

diff --git a/tox.ini b/tox.ini
index 6b266adda460080e797250c2df5b217a3cae3a46..7cd9bec94fbe3b98a78c857481192e4a4aae8109 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = docs,docs-linkcheck,jjb-version,prefix,robot,pylint
+envlist = docs,docs-linkcheck,jjb-version,prefix,robot
 #    pre-commit
 skipsdist = true
 
@@ -16,7 +16,7 @@ commands = sphinx-build -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxi
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:4.1.0}
+    jenkins-job-builder=={env:JJB_VERSION:5.0.2}
 commands =
     jenkins-jobs {posargs:--help}