Merge "Remove deprecated OS packagecloud clean up jobs."

3 files changed, 3 insertions, 64 deletions

diff --git a/jjb/ci-management/package-list.sh b/jjb/ci-management/package-list.sh
index 6172b7b54..2b4325641 100644
--- a/jjb/ci-management/package-list.sh
+++ b/jjb/ci-management/package-list.sh
@@ -34,16 +34,6 @@ libparc-dev \
 libmemif-dev \
 longbow-dev"
 
-export PACKAGE_LIST_CENTOS="libhicnctrl-devel \
-libhicnctrl-memif-devel \
-libhicntransport-memif-devel \
-libhicn-devel \
-libhicntransport-devel \
-hicn-plugin-devel \
-libparc-devel \
-libmemif-devel \
-longbow-devel"
-
 export VERSION_WHITELIST="19.01-227 \
 19.08-289 \
 20.01-73 \
diff --git a/jjb/ci-management/packagecloud-repo-cleanup.sh b/jjb/ci-management/packagecloud-repo-cleanup.sh
index d664ae3ab..456b3a36d 100644
--- a/jjb/ci-management/packagecloud-repo-cleanup.sh
+++ b/jjb/ci-management/packagecloud-repo-cleanup.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 echo "---> jjb/ci-management/packagecloud-repo-cleanup.sh"
 
-set -euo pipefail
+set -euxo pipefail
 
 # Number of packages to keep.
 N_PACKAGES=5
 
 PACKAGECLOUD_REPO_DEB="https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh"
-PACKAGECLOUD_REPO_RPM="https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh"
 
 FACTER_OS=$(/usr/bin/facter operatingsystem)
 PACKAGE_LIST=""
@@ -77,46 +76,6 @@ build_package_blacklist_ubuntu () {
     echo ${OUTPUT_LIST}
 }
 
-# Params
-# $1: Package list
-build_package_blacklist_centos () {
-    PACKAGE_LIST=${@}
-    OUTPUT_LIST=""
-    VERSIONS=""
-    ARCH=$(uname -m)
-
-    for package in ${PACKAGE_LIST}; do
-        OUTPUT=$(yum --showduplicates list ${package} 2> /dev/null)
-        if [[ ${?} -ne 0 || -z "${OUTPUT}" ]]; then
-            continue
-        fi
-
-        VERSIONS="$(echo ${OUTPUT} | grep -Eo "${VERSION_REGEX}" | head -n -${N_PACKAGES})"
-
-        for version in ${VERSIONS}; do
-            if ! check_version_whitelist ${version}; then
-                OUTPUT_LIST+="${package}-${version}.${ARCH}.rpm "
-            fi
-        done
-    done
-
-    echo ${OUTPUT_LIST}
-}
-
-promote_attic_repo_centos () {
-    FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease)
-    FACTER_ARCH=$(/usr/bin/facter architecture)
-
-    for package in ${@}; do
-        echo package_cloud promote \
-            ${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ \
-            ${package} ${PCIO_CO}/attic/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/
-        package_cloud promote \
-            ${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ \
-            ${package} ${PCIO_CO}/attic/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/
-    done
-}
-
 promote_attic_repo_ubuntu () {
     FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename)
 
@@ -140,12 +99,6 @@ setup_fdio_repo () {
         FUNCTIONS["promote_attic_repo"]="promote_attic_repo_ubuntu"
         PACKAGE_LIST="${PACKAGE_LIST_COMMON} ${PACKAGE_LIST_UBUNTU}"
       ;;
-      CentOS)
-        curl -s ${PACKAGECLOUD_REPO_RPM} | sudo bash
-        FUNCTIONS["package_blacklist"]="build_package_blacklist_centos"
-        FUNCTIONS["promote_attic_repo"]="promote_attic_repo_centos"
-        PACKAGE_LIST="${PACKAGE_LIST_COMMON} ${PACKAGE_LIST_CENTOS}"
-      ;;
       *)
         echo_err "Distribution ${FACTER_OS} is not supported."
       ;;
diff --git a/jjb/ci-management/packagecloud-repo-cleanup.yaml b/jjb/ci-management/packagecloud-repo-cleanup.yaml
index dcad9efc1..1c107c2fa 100644
--- a/jjb/ci-management/packagecloud-repo-cleanup.yaml
+++ b/jjb/ci-management/packagecloud-repo-cleanup.yaml
@@ -5,10 +5,7 @@
       - 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}'
     project: 'ci-management'
     os:
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
-      - centos7:
-          repo-os-part: 'centos7'
+      - ubuntu2004
 
     executor-arch: "x86_64"
 
@@ -19,8 +16,7 @@
       - 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}'
     project: 'ci-management'
     os:
-      - ubuntu1804:
-          repo-os-part: 'ubuntu-arm.bionic.main'
+      - ubuntu2004
 
     executor-arch: "aarch64"