diff options
-rw-r--r-- | jjb/ci-management/packagecloud-repo-cleanup.sh | 4 | ||||
-rw-r--r-- | jjb/ci-management/packagecloud-repo-cleanup.yaml | 32 |
2 files changed, 24 insertions, 12 deletions
diff --git a/jjb/ci-management/packagecloud-repo-cleanup.sh b/jjb/ci-management/packagecloud-repo-cleanup.sh index 8fdfe1187..d664ae3ab 100644 --- a/jjb/ci-management/packagecloud-repo-cleanup.sh +++ b/jjb/ci-management/packagecloud-repo-cleanup.sh @@ -1,4 +1,6 @@ #!/bin/bash +echo "---> jjb/ci-management/packagecloud-repo-cleanup.sh" + set -euo pipefail # Number of packages to keep. @@ -158,4 +160,4 @@ build_package_blacklist () { setup_fdio_repo PACKAGES_TO_PROMOTE=$(build_package_blacklist ${PACKAGE_LIST}) -promote_to_attic_repo ${PACKAGES_TO_PROMOTE}
\ No newline at end of file +promote_to_attic_repo ${PACKAGES_TO_PROMOTE} diff --git a/jjb/ci-management/packagecloud-repo-cleanup.yaml b/jjb/ci-management/packagecloud-repo-cleanup.yaml index c64e24a08..7b8dae452 100644 --- a/jjb/ci-management/packagecloud-repo-cleanup.yaml +++ b/jjb/ci-management/packagecloud-repo-cleanup.yaml @@ -1,19 +1,29 @@ - project: - name: packagecloud-repo-cleanup + name: packagecloud-repo-cleanup-x86_64 jobs: - - 'packagecloud-repo-cleanup-release-{os}' - - 'packagecloud-repo-cleanup-hicn-{os}' + - 'packagecloud-repo-cleanup-release-{os}-{executor-arch}' + - 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}' project: 'ci-management' os: - ubuntu1804: repo-os-part: 'ubuntu.bionic.main' - - ubuntu1804arm: - repo-os-part: 'ubuntu-arm.bionic.main' - - ubuntu1604: - repo-os-part: 'ubuntu.xenial.main' - centos7: repo-os-part: 'centos7' + executor-arch: "x86_64" + +- project: + name: packagecloud-repo-cleanup-aarch64 + jobs: + - 'packagecloud-repo-cleanup-release-{os}-{executor-arch}' + - 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}' + project: 'ci-management' + os: + - ubuntu1804: + repo-os-part: 'ubuntu-arm.bionic.main' + + executor-arch: "aarch64" + - project: name: packagecloud-view views: @@ -21,10 +31,10 @@ project-name: packagecloud - job-template: - name: 'packagecloud-repo-cleanup-release-{os}' + name: 'packagecloud-repo-cleanup-release-{os}-{executor-arch}' project-type: freestyle - node: '{os}-us' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true build-discarder: @@ -83,10 +93,10 @@ maven-version: 'mvn36' - job-template: - name: 'packagecloud-repo-cleanup-hicn-{os}' + name: 'packagecloud-repo-cleanup-hicn-{os}-{executor-arch}' project-type: freestyle - node: '{os}-us' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true build-discarder: |