From: David Galloway Date: Wed, 20 Aug 2025 21:37:05 +0000 (-0400) Subject: ceph-tag: Always run playbook regardless of TAG X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e5c72fcce6ab8d21950abda2984a305f7182fd8;p=ceph-build.git ceph-tag: Always run playbook regardless of TAG The individual tasks in the role already have when statements. Signed-off-by: David Galloway --- diff --git a/ceph-tag/build/build b/ceph-tag/build/build index 1fbde3d1..61749994 100644 --- a/ceph-tag/build/build +++ b/ceph-tag/build/build @@ -2,20 +2,16 @@ set -ex -if [ "$TAG" = false ] ; then - echo "Assuming tagging process has succeeded before because TAG was set to false" -else - # the following two methods exist in scripts/build_utils.sh - pkgs=( "ansible" ) - TEMPVENV=$(create_venv_dir) - VENV=${TEMPVENV}/bin - install_python_packages $TEMPVENV "pkgs[@]" - - # remove "-release" from $BRANCH variable in case it was accidentally passed in the Jenkins UI - BRANCH=${BRANCH//-release/} - - # run ansible to do all the tagging and release specifying - # a local connection and 'localhost' as the host where to execute - cd "$WORKSPACE/ceph-build/ansible/" - $VENV/ansible-playbook -i "localhost," -c local release.yml --extra-vars="stage=push version=$VERSION branch=$BRANCH force_version=$FORCE_VERSION release=$RELEASE_TYPE tag=$TAG project=ceph token=$GITHUB_TOKEN" -fi +# the following two methods exist in scripts/build_utils.sh +pkgs=( "ansible" ) +TEMPVENV=$(create_venv_dir) +VENV=${TEMPVENV}/bin +install_python_packages $TEMPVENV "pkgs[@]" + +# remove "-release" from $BRANCH variable in case it was accidentally passed in the Jenkins UI +BRANCH=${BRANCH//-release/} + +# run ansible to do all the tagging and release specifying +# a local connection and 'localhost' as the host where to execute +cd "$WORKSPACE/ceph-build/ansible/" +$VENV/ansible-playbook -i "localhost," -c local release.yml --extra-vars="stage=push version=$VERSION branch=$BRANCH force_version=$FORCE_VERSION release=$RELEASE_TYPE tag=$TAG project=ceph token=$GITHUB_TOKEN"