scripts/build_utils: remove create_build_status()

it's identical to update_build_status(), apart from that it is only used
for creating the build status. but from the semantic point of view,
create is also an "update", IMHO. so consolidating them sounds like a
good move.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb
index e91ed75c02cda0ed3b8784eec1416a1cbc22854c..417882293be4165e1218599abc718fe499b2fb90 100644 (file)
--- a/ceph-build/build/setup_deb
+++ b/ceph-build/build/setup_deb
@@ -53,7 +53,7 @@ NORMAL_DISTRO_VERSION=$DIST
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index 4a8d91b3e3bec5c5bc1951d1cecb87daf3c78f22..e507a7ee072b0f4104492bff80bf7ed0a0e16b8d 100644 (file)
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -43,7 +43,7 @@ NORMAL_DISTRO_VERSION=$RELEASE
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)

diff --git a/ceph-dev-build/build/setup_deb b/ceph-dev-build/build/setup_deb
index 5d2481c1984301a73958fe6746bc462048c1c1dc..a2a4dc1b9abfcae1293fa367ce6b7078448dd425 100644 (file)
--- a/ceph-dev-build/build/setup_deb
+++ b/ceph-dev-build/build/setup_deb
@@ -53,7 +53,7 @@ NORMAL_DISTRO_VERSION=$DIST
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)

diff --git a/ceph-dev-build/build/setup_osc b/ceph-dev-build/build/setup_osc
index 1e350ed757e9fd1994eec1137c2a793edc92b73f..10714cf31ac3a3b2d22d4fcabbdd056fb6175ffb 100644 (file)
--- a/ceph-dev-build/build/setup_osc
+++ b/ceph-dev-build/build/setup_osc
@@ -75,7 +75,7 @@ NORMAL_DISTRO_VERSION=$RELEASE
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index 74f4e3656c229e5deb321fe446b9b0f854a7ad79..11016cd35bcb089931afe15d45a8457fedc73efe 100644 (file)
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -45,7 +45,7 @@ NORMAL_DISTRO_VERSION=$RELEASE
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)

diff --git a/ceph-dev-cron/build/notify b/ceph-dev-cron/build/notify
index cb1ed77127e419700af067af5c10dcbd82c6abcc..27fa3cd8b1aa814d12bea60ba36c1a908da1adaf 100644 (file)
--- a/ceph-dev-cron/build/notify
+++ b/ceph-dev-cron/build/notify
@@ -6,4 +6,4 @@
 BRANCH=`branch_slash_filter ${GIT_BRANCH}`
 SHA1=${GIT_COMMIT}
 
-create_build_status "queued" "ceph"
+update_build_status "queued" "ceph"

diff --git a/ceph-dev-new-build/build/setup_deb b/ceph-dev-new-build/build/setup_deb
index 5d2481c1984301a73958fe6746bc462048c1c1dc..a2a4dc1b9abfcae1293fa367ce6b7078448dd425 100644 (file)
--- a/ceph-dev-new-build/build/setup_deb
+++ b/ceph-dev-new-build/build/setup_deb
@@ -53,7 +53,7 @@ NORMAL_DISTRO_VERSION=$DIST
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)

diff --git a/ceph-dev-new-build/build/setup_mingw b/ceph-dev-new-build/build/setup_mingw
index 27507c6aa74d4c9a36f7a13e4f5e1c99717648c1..0b944127082347ce536ed4a1f9ff5d3239dc892a 100644 (file)
--- a/ceph-dev-new-build/build/setup_mingw
+++ b/ceph-dev-new-build/build/setup_mingw
@@ -42,7 +42,7 @@ NORMAL_DISTRO_VERSION="1809"
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)

diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index 776f52f4df93ac2e788ca6e01bdd1f0e70ac7029..f7f57d48ed82247ff988130fef1c357096672385 100644 (file)
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -43,7 +43,7 @@ NORMAL_DISTRO_VERSION=$RELEASE
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)

diff --git a/ceph-dev-new-trigger/build/notify b/ceph-dev-new-trigger/build/notify
index 39411b7aed06f9cdaf37319b1340878f6c70e622..736995544aeed0d449874ca33d19e056db603905 100644 (file)
--- a/ceph-dev-new-trigger/build/notify
+++ b/ceph-dev-new-trigger/build/notify
@@ -6,5 +6,5 @@
 BRANCH=`branch_slash_filter ${GIT_BRANCH}`
 SHA1=${GIT_COMMIT}
 
-create_build_status "queued" "ceph"
+update_build_status "queued" "ceph"
 

diff --git a/ceph-dev-trigger/build/notify b/ceph-dev-trigger/build/notify
index cb1ed77127e419700af067af5c10dcbd82c6abcc..27fa3cd8b1aa814d12bea60ba36c1a908da1adaf 100644 (file)
--- a/ceph-dev-trigger/build/notify
+++ b/ceph-dev-trigger/build/notify
@@ -6,4 +6,4 @@
 BRANCH=`branch_slash_filter ${GIT_BRANCH}`
 SHA1=${GIT_COMMIT}
 
-create_build_status "queued" "ceph"
+update_build_status "queued" "ceph"

diff --git a/kernel/build/setup b/kernel/build/setup
index e698f596339908f3bb88e54d99a6ae3372e941f8..a8ede06f9e3f8b6b9c4e1e1bd112b888e5feda35 100644 (file)
--- a/kernel/build/setup
+++ b/kernel/build/setup
@@ -89,4 +89,4 @@ git clean -fxd
 export SHA1="${GIT_COMMIT}"
 
 # create build status in shaman
-create_build_status "started" "kernel" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $ARCH
+update_build_status "started" "kernel" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $ARCH

diff --git a/nfs-ganesha-stable/build/build_deb b/nfs-ganesha-stable/build/build_deb
index 4bda8cc5896b06c51bd1a6c85ba5dd93ee71b782..a3239fbd21cceafb9760a4dbca48c755fc1f5a1e 100644 (file)
--- a/nfs-ganesha-stable/build/build_deb
+++ b/nfs-ganesha-stable/build/build_deb
@@ -102,7 +102,7 @@ NORMAL_DISTRO_VERSION=$DIST
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "nfs-ganesha-stable" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "nfs-ganesha-stable" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 cd $WORKSPACE/nfs-ganesha-debian
 git checkout ${NFS_GANESHA_DEBIAN_BRANCH}

diff --git a/nfs-ganesha-stable/build/build_rpm b/nfs-ganesha-stable/build/build_rpm
index 4a02ef8c3e360268288513c766da920533dc5271..3fd82cbd71febe72d82dea7ebae6be6bcf534eb6 100644 (file)
--- a/nfs-ganesha-stable/build/build_rpm
+++ b/nfs-ganesha-stable/build/build_rpm
@@ -77,7 +77,7 @@ NORMAL_DISTRO_VERSION=$RELEASE
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "nfs-ganesha-stable" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "nfs-ganesha-stable" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 cd $WORKSPACE/nfs-ganesha
 

diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb
index 511b8aead171ab6526e214434bd2f3933baae151..2b2166dd7f9c1c60fcc8b4f059aa93e877670c69 100644 (file)
--- a/nfs-ganesha/build/build_deb
+++ b/nfs-ganesha/build/build_deb
@@ -38,7 +38,7 @@ NORMAL_DISTRO_VERSION=$DIST
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "nfs-ganesha" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "nfs-ganesha" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 ## Setup the pbuilder
 setup_pbuilder use_gcc

diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index 71d2b3d911815239a5a0dfb3f4c74339ea0e93a6..cd1ae371ddd40a823b72c156ef8c1f64a61bf25c 100644 (file)
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -88,7 +88,7 @@ NORMAL_DISTRO_VERSION=$RELEASE
 NORMAL_ARCH=$ARCH
 
 # create build status in shaman
-create_build_status "started" "nfs-ganesha" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
+update_build_status "started" "nfs-ganesha" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 cd $WORKSPACE/nfs-ganesha
 

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index cb086a45cbc4540eddbd27ff44e6a2cc02b26427..c09519db36577cd2667851383cdfdc3b0575fa5b 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -363,26 +363,8 @@ EOF
 
 
 update_build_status() {
-    # A proxy script to PUT (update) the status of a build in shaman
-    # 'state' can be either of: 'started', 'completed', or 'failed'
-    # 'project' is used to post to the right url in shaman
-
-    # required
-    state=$1
-    project=$2
-
-    # optional
-    distro=$3
-    distro_version=$4
-    distro_arch=$5
-
-    submit_build_status "POST" $state $project $distro $distro_version $distro_arch
-}
-
-
-create_build_status() {
-    # A proxy script to POST (create) the status of a build in shaman for
-    # a normal/initial build
+    # A proxy script to PUT (create or update) the status of a build
+    # in shaman for a normal/initial build
     # 'state' can be either of: 'started', 'completed', or 'failed'
     # 'project' is used to post to the right url in shaman