Set ceph build status complete in separate script

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm
index b6eb307c2ba865d734433d0aca73142d51e4ce0b..10533f94495e9b7fa581530d8a5e4ba95c83760b 100644 (file)
--- 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 a101450eeac6f968236ad8934c9c2e2f252c68f7..c7cd1b4d2515845008a8e89236a978fff679714f 100644 (file)
--- 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 f4150c1411235e717ba3fe2372e8d8efa60a9769..0da7220977fdb0de87b0ac4b0516a3174342766b 100644 (file)
--- 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 e80c3226718ee6dfcc36d7294a6de1ae72215adb..5314ee63941ef0f5a79340f6fd33d692391b64c8 100644 (file)
--- 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 2667e93f78b0c4a04893ce7a0680326dae7c09e1..c2bb23b023b59d6ea2639ef1f46c311334bbb02a 100644 (file)
--- 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 735f144d5a106beff6c6c1121270e41f593c980c..da0733a51198b3221b6e54cad95a2ac017778e93 100644 (file)
--- 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 f4150c1411235e717ba3fe2372e8d8efa60a9769..0da7220977fdb0de87b0ac4b0516a3174342766b 100644 (file)
--- 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 22987d4f626e7767bf8f41df33a2f6047ef59840..142c520d1076abca83144bec11aec1562a4a4f1d 100644 (file)
--- 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 92c1d5608cba63cbf0b028282a608e7c9ace1a2b..cb784890c62929674609e2506e5bceae7ee9ae17 100644 (file)
--- 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 f6c16be3419b8a24116dc2cece1eb46881fad4cd..0100c34a06c334bc7743280af69e4b0a3802f089 100755 (executable)
--- 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 (file)
index 0000000..61a13a5
--- /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