diff options
Diffstat (limited to 'jjb/ci-management')
| -rw-r--r-- | jjb/ci-management/ci-management-jobs.yaml | 11 | ||||
| -rw-r--r-- | jjb/ci-management/ci-packer-jobs.yaml | 11 | ||||
| -rw-r--r-- | jjb/ci-management/package-list.sh | 10 | ||||
| -rw-r--r-- | jjb/ci-management/packagecloud-repo-cleanup.sh | 53 | ||||
| -rw-r--r-- | jjb/ci-management/packagecloud-repo-cleanup.yaml | 72 |
5 files changed, 50 insertions, 107 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index e99855eb3..3380eda7b 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -6,14 +6,15 @@ - gerrit-jenkins-cfg-merge - gerrit-jenkins-sandbox-cleanup - gerrit-jjb-deploy-job - - gerrit-jjb-merge + - gerrit-jjb-merge: + build-node: centos8-builder-2c-2g - gerrit-jjb-verify project: ci-management project-name: ci-management - build-node: centos7-builder-4c-4g - build-timeout: 60 - jjb-version: 2.6.0 + build-node: centos8-builder-2c-2g + build-timeout: 15 + jjb-version: 6.0.0 - project: name: ci-management @@ -26,6 +27,6 @@ project-name: ci-management jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-4c-4g + build-node: centos8-builder-2c-2g project: ci-management branch: master diff --git a/jjb/ci-management/ci-packer-jobs.yaml b/jjb/ci-management/ci-packer-jobs.yaml index 1672c9350..0496d98ea 100644 --- a/jjb/ci-management/ci-packer-jobs.yaml +++ b/jjb/ci-management/ci-packer-jobs.yaml @@ -7,16 +7,15 @@ project: ci-management project-name: ci-management - build-node: centos7-builder-2c-2g + build-node: centos8-builder-2c-2g openstack-cloud: vexci - packer-version: 1.4.0 + packer-version: 1.8.2 platforms: - centos-7 - - ubuntu-16.04 - - ubuntu-18.04 - - ubuntu-18.04-arm64 - - ubuntu-16.04-arm64 + - centos-8 + - ubuntu-20.04 + - ubuntu-20.04-arm64 templates: - builder 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 8fdfe1187..456b3a36d 100644 --- a/jjb/ci-management/packagecloud-repo-cleanup.sh +++ b/jjb/ci-management/packagecloud-repo-cleanup.sh @@ -1,11 +1,12 @@ #!/bin/bash -set -euo pipefail +echo "---> jjb/ci-management/packagecloud-repo-cleanup.sh" + +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="" @@ -75,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) @@ -138,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." ;; @@ -158,4 +113,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..1c107c2fa 100644 --- a/jjb/ci-management/packagecloud-repo-cleanup.yaml +++ b/jjb/ci-management/packagecloud-repo-cleanup.yaml @@ -1,18 +1,24 @@ - 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' + - ubuntu2004 + + 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: + - ubuntu2004 + + executor-arch: "aarch64" - project: name: packagecloud-view @@ -21,17 +27,15 @@ 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: - daysToKeep: '{build-days-to-keep}' - numToKeep: 100 - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -42,10 +46,6 @@ os: '{os}' - stream-parameter: stream: 'release' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. wrappers: - fdio-infra-wrappers: @@ -75,25 +75,25 @@ target: '/root/packagecloud_api' - shell: !include-raw-escape: + - ../scripts/setup_executor_env.sh + - shell: + !include-raw-escape: - package-list.sh - packagecloud-repo-cleanup.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish - 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: - daysToKeep: '{build-days-to-keep}' - numToKeep: 100 - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -104,10 +104,6 @@ os: '{os}' - stream-parameter: stream: 'hicn' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. wrappers: - fdio-infra-wrappers: @@ -138,9 +134,11 @@ target: '/root/packagecloud_api' - shell: !include-raw-escape: + - ../scripts/setup_executor_env.sh + - shell: + !include-raw-escape: - package-list.sh - packagecloud-repo-cleanup.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish |