Merge "Remove all refs to carbon branch for packaging"

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index bcb79b5f8330ac1f28cc4fa7c8444a596b03f2d4..20f632e71618c02e6da44196c18478497d5d1725 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -15,9 +15,7 @@ $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
 # Convert stream to numeric ODL major version
-if [ "$STREAM" == "carbon" ]; then
-  VERSION_MAJOR=6
-elif [ "$STREAM" == "nitrogen" ]; then
+if [ "$STREAM" == "nitrogen" ]; then
   VERSION_MAJOR=7
 elif [ "$STREAM" == "oxygen" ]; then
   VERSION_MAJOR=8
@@ -34,4 +32,3 @@ fi
                                          --changelog_email "$CHANGELOG_EMAIL" \
                                          latest_snap \
                                          --major "$VERSION_MAJOR"
-

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 56dd06a9dba802e92841ec26ed3e955957b606c8..0465cf603f5c4afc1f24f5a535d79cff2db022ab 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -26,7 +26,6 @@
 
     stream:
       - fluorine
-      - carbon
       - nitrogen
       - oxygen
     distro:
@@ -276,27 +275,6 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Carbon SR2 tarball
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
-      # Test Carbon multipatch zip (no parallel tarball available)
-      # NB: This will need to be updated as old builds expire
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.4-SNAPSHOT/distribution-karaf-0.6.4-20180408.212935-2.zip'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
-      # Test latest Carbon snapshot
-      - inject:
-          properties-content: 'STREAM=carbon'
-      - shell: !include-raw: build-rpm-snap.sh
-      - install-test-uninstall-rpm
-
       # Test Nitrogen tarball
       - inject:
           # yamllint disable-line rule:line-length

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 0ec0a7b3812c748990d306ded38cf6ad0da2d566..5ef7d58efb1af09a798d0768477f4319a98e8e05 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -17,8 +17,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'