From a935b6a6ec86762143948bdba4fd732881076480 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 27 Nov 2024 11:49:59 -0700 Subject: [PATCH] Set ceph build status complete in separate script Signed-off-by: Zack Cerza --- ceph-build/build/build_rpm | 3 --- ceph-build/config/definitions/ceph-build.yml | 2 ++ ceph-dev-build/build/build_mingw | 3 --- ceph-dev-build/build/build_osc | 3 --- ceph-dev-build/build/build_rpm | 3 --- ceph-dev-build/config/definitions/ceph-dev-build.yml | 4 ++++ ceph-dev-new-build/build/build_mingw | 3 --- ceph-dev-new-build/build/build_rpm | 3 --- ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml | 4 ++++ scripts/build_utils.sh | 3 --- scripts/status_completed | 2 ++ 11 files changed, 12 insertions(+), 21 deletions(-) create mode 100644 scripts/status_completed diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm index b6eb307c..10533f94 100644 --- a/ceph-build/build/build_rpm +++ b/ceph-build/build/build_rpm @@ -82,6 +82,3 @@ if [[ $DISTRO == "centos" && "$RELEASE" =~ 8|9 ]] ; then cd ${WORKSPACE}/dist/ceph-${cephver}/container CEPH_SHA1=${SHA1} ./build.sh fi - -# update shaman with the completed build status -update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index a101450e..c7cd1b4d 100644 --- a/ceph-build/config/definitions/ceph-build.yml +++ b/ceph-build/config/definitions/ceph-build.yml @@ -93,6 +93,7 @@ - ../../build/setup_deb - ../../build/setup_pbuilder - ../../build/build_deb + - ../../../scripts/status_completed # rpm build scripts - shell: !include-raw: @@ -100,6 +101,7 @@ - ../../../scripts/build_utils.sh - ../../build/setup_rpm - ../../build/build_rpm + - ../../../scripts/status_completed publishers: - postbuildscript: builders: diff --git a/ceph-dev-build/build/build_mingw b/ceph-dev-build/build/build_mingw index f4150c14..0da72209 100644 --- a/ceph-dev-build/build/build_mingw +++ b/ceph-dev-build/build/build_mingw @@ -55,6 +55,3 @@ fi # pbuilder will leave root-owned files in shared workspaces sudo chown -R jenkins-build ${WORKSPACE}/dist - -# update shaman with the completed build status -update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH diff --git a/ceph-dev-build/build/build_osc b/ceph-dev-build/build/build_osc index e80c3226..5314ee63 100644 --- a/ceph-dev-build/build/build_osc +++ b/ceph-dev-build/build/build_osc @@ -88,6 +88,3 @@ EOF echo Check the status of the repo at: https://shaman.ceph.com/api/repos/${chacra_endpoint}/flavors/${FLAVOR}/ fi - -# update shaman with the completed build status -update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index 2667e93f..c2bb23b0 100644 --- a/ceph-dev-build/build/build_rpm +++ b/ceph-dev-build/build/build_rpm @@ -104,6 +104,3 @@ if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && "$RELEASE" =~ 8|9 ]] ; t cd ${WORKSPACE}/dist/ceph-${cephver}/container CEPH_SHA1=${SHA1} ./build.sh fi - -# update shaman with the completed build status -update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 735f144d..da0733a5 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -84,6 +84,7 @@ - ../../build/setup_deb - ../../build/setup_pbuilder - ../../build/build_deb + - ../../../scripts/status_completed # rpm build scripts - shell: !include-raw: @@ -91,6 +92,7 @@ - ../../../scripts/build_utils.sh - ../../build/setup_rpm - ../../build/build_rpm + - ../../../scripts/status_completed # osc build scripts - shell: !include-raw: @@ -98,6 +100,7 @@ - ../../../scripts/build_utils.sh - ../../build/setup_osc - ../../build/build_osc + - ../../../scripts/status_completed # mingw build scripts (targeting Windows) - shell: !include-raw: @@ -105,6 +108,7 @@ - ../../../scripts/build_utils.sh - ../../build/setup_mingw - ../../build/build_mingw + - ../../../scripts/status_completed publishers: - postbuildscript: diff --git a/ceph-dev-new-build/build/build_mingw b/ceph-dev-new-build/build/build_mingw index f4150c14..0da72209 100644 --- a/ceph-dev-new-build/build/build_mingw +++ b/ceph-dev-new-build/build/build_mingw @@ -55,6 +55,3 @@ fi # pbuilder will leave root-owned files in shared workspaces sudo chown -R jenkins-build ${WORKSPACE}/dist - -# update shaman with the completed build status -update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm index 22987d4f..142c520d 100644 --- a/ceph-dev-new-build/build/build_rpm +++ b/ceph-dev-new-build/build/build_rpm @@ -108,6 +108,3 @@ if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && "$RELEASE" =~ 8|9 ]] ; t cd ${WORKSPACE}/dist/ceph-${cephver}/container CEPH_SHA1=${SHA1} ./build.sh fi - -# update shaman with the completed build status -update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml index 92c1d560..cb784890 100644 --- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml +++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml @@ -85,6 +85,7 @@ - ../../build/setup_deb - ../../build/setup_pbuilder - ../../build/build_deb + - ../../../scripts/status_completed # rpm build scripts - shell: !include-raw: @@ -93,6 +94,7 @@ - ../../../scripts/setup_sccache.sh - ../../build/setup_rpm - ../../build/build_rpm + - ../../../scripts/status_completed # osc build scripts - shell: !include-raw: @@ -100,6 +102,7 @@ - ../../../scripts/build_utils.sh - ../../build/setup_osc - ../../build/build_osc + - ../../../scripts/status_completed # mingw build scripts (targeting Windows) - shell: !include-raw: @@ -107,6 +110,7 @@ - ../../../scripts/build_utils.sh - ../../build/setup_mingw - ../../build/build_mingw + - ../../../scripts/status_completed publishers: - postbuildscript: diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index f6c16be3..0100c34a 100755 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -1021,9 +1021,6 @@ EOF echo Check the status of the repo at: https://shaman.ceph.com/api/repos/${chacra_repo_endpoint}/ fi - - # update shaman with the completed build status - update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH } extra_cmake_args() { diff --git a/scripts/status_completed b/scripts/status_completed new file mode 100644 index 00000000..61a13a59 --- /dev/null +++ b/scripts/status_completed @@ -0,0 +1,2 @@ +# update shaman with the completed build status +update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH -- 2.39.5