From 5c6831fdf8d35af6c9ab61f871cebfe9c2e81e30 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 16 Jun 2021 17:27:32 -0400 Subject: [PATCH] ceph-iscsi-*: Support CentOS8 Signed-off-by: David Galloway --- ceph-iscsi-cli/build/build_rpm | 2 +- ceph-iscsi-config/build/build_rpm | 2 +- ceph-iscsi-stable/build/build_rpm | 2 +- .../config/definitions/ceph-iscsi-stable.yml | 48 +++++++++++++++---- ceph-iscsi-tools/build/build_rpm | 2 +- .../config/definitions/ceph-iscsi-tools.yml | 5 +- 6 files changed, 47 insertions(+), 14 deletions(-) diff --git a/ceph-iscsi-cli/build/build_rpm b/ceph-iscsi-cli/build/build_rpm index d4ebaff2..885c2349 100644 --- a/ceph-iscsi-cli/build/build_rpm +++ b/ceph-iscsi-cli/build/build_rpm @@ -52,7 +52,7 @@ SRPM=$(readlink -f $WORKSPACE/dist/SRPMS/*.src.rpm) ## Build the binaries with mock echo "Building RPMs" sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --scrub=all -sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) +sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) ## Upload the created RPMs to chacra chacra_endpoint="${PROJECT}/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}" diff --git a/ceph-iscsi-config/build/build_rpm b/ceph-iscsi-config/build/build_rpm index 30f91a88..891e1fda 100644 --- a/ceph-iscsi-config/build/build_rpm +++ b/ceph-iscsi-config/build/build_rpm @@ -52,7 +52,7 @@ SRPM=$(readlink -f $WORKSPACE/dist/SRPMS/*.src.rpm) ## Build the binaries with mock echo "Building RPMs" sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --scrub=all -sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) +sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) ## Upload the created RPMs to chacra chacra_endpoint="${PROJECT}/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}" diff --git a/ceph-iscsi-stable/build/build_rpm b/ceph-iscsi-stable/build/build_rpm index 2ec241d7..ea03ace2 100644 --- a/ceph-iscsi-stable/build/build_rpm +++ b/ceph-iscsi-stable/build/build_rpm @@ -55,7 +55,7 @@ for project in $(ls -h | grep -v dist); do # Build the binaries with mock echo "Building RPMs" sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --scrub=all - sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) + sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) done cd $WORKSPACE diff --git a/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml b/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml index bc857190..740f295a 100644 --- a/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml +++ b/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml @@ -22,29 +22,29 @@ - job: name: ceph-iscsi-stable - node: 'centos7 && x86_64 && huge' - project-type: freestyle + project-type: matrix defaults: global display-name: 'ceph-iscsi-stable' concurrent: true + parameters: - string: name: CEPH_ISCSI_BRANCH description: "The git branch (or tag) to build" - default: "3.2" + default: "3.5" - string: name: CEPH_ISCSI_TOOLS_BRANCH description: "The git branch (or tag) to build" - default: "2.1" + default: "2.2" - string: - name: DISTRO - description: "A list of distros to build for. Available options are: centos7" - default: "centos7" + name: DISTROS + description: "A list of distros to build for. Available options are: centos7 centos8" + default: "centos7 centos8" - string: - name: ARCH + name: ARCHS description: "A list of architectures to build for. Available options are: x86_64" default: "x86_64" @@ -67,6 +67,38 @@ If this is checked, then the binaries will be built and pushed to chacra even if description: "Base parent path for virtualenv locations, set to avoid issues with extremely long paths that are incompatible with tools like pip. Defaults to '/tmp/' (note the trailing slash, which is required)." default: "/tmp/" + execution-strategy: + combination-filter: | + DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && + (ARCH == "x86_64" || (ARCH == "arm64" && ["centos7", "centos8"].contains(DIST))) + axes: + - axis: + type: label-expression + name: MACHINE_SIZE + values: + - huge + - axis: + type: label-expression + name: AVAILABLE_ARCH + values: + - x86_64 + - axis: + type: label-expression + name: AVAILABLE_DIST + values: + - centos7 + - centos8 + - axis: + type: dynamic + name: DIST + values: + - DISTROS + - axis: + type: dynamic + name: ARCH + values: + - ARCHS + scm: - ceph-iscsi - ceph-iscsi-tools diff --git a/ceph-iscsi-tools/build/build_rpm b/ceph-iscsi-tools/build/build_rpm index 7a9d503f..f49add5a 100644 --- a/ceph-iscsi-tools/build/build_rpm +++ b/ceph-iscsi-tools/build/build_rpm @@ -52,7 +52,7 @@ SRPM=$(readlink -f $WORKSPACE/dist/SRPMS/*.src.rpm) ## Build the binaries with mock echo "Building RPMs" sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --scrub=all -sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) +sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) ## Upload the created RPMs to chacra chacra_endpoint="${PROJECT}/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}" diff --git a/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml b/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml index cfbd8476..dea44c53 100644 --- a/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml +++ b/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml @@ -14,8 +14,8 @@ - string: name: DISTROS - description: "A list of distros to build for. Available options are: xenial, centos7, centos6, trusty-pbuilder, precise, wheezy, and jessie" - default: "centos7 xenial" + description: "A list of distros to build for. Available options are: xenial, centos7, centos8" + default: "centos7 centos8" - string: name: ARCHS @@ -52,6 +52,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if name: AVAILABLE_DIST values: - centos7 + - centos8 - xenial - axis: type: dynamic -- 2.39.5