Remove SM distribution jobs

Clean Self Managed distribution jobs.
Adjust shell scripts for opendaylight artifact version 0.X.Y.

Change-Id: Id33642ee91747d45baac5cc0d6e4e7d75b83e3d3
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

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: