diff --git a/contrib/test-mbs-fedora-staging-failed-build.sh b/contrib/test-mbs-fedora-staging-failed-build.sh index 5d5121e3..95f174f4 100755 --- a/contrib/test-mbs-fedora-staging-failed-build.sh +++ b/contrib/test-mbs-fedora-staging-failed-build.sh @@ -13,7 +13,7 @@ git checkout fail-mbs-test git commit --allow-empty -m "Empty test commit, for MBS in staging." git push origin fail-mbs-test -build_id=$(fedpkg-stage module-build | tail -1 | awk '{ print $3 }' | cut -c 2-) +build_id=$(fedpkg-stage module-build | tail -1 | awk '{ print $3 }') echo "Working with module build $build_id" fedpkg-stage module-build-watch $build_id diff --git a/contrib/test-mbs-fedora-staging-rebuild.sh b/contrib/test-mbs-fedora-staging-rebuild.sh index 53720d54..7880cbbd 100755 --- a/contrib/test-mbs-fedora-staging-rebuild.sh +++ b/contrib/test-mbs-fedora-staging-rebuild.sh @@ -15,7 +15,7 @@ git clone ssh://$FAS@pkgs.stg.fedoraproject.org/modules/testmodule cd testmodule git commit --allow-empty -m "Empty test commit, for MBS in staging." git push origin master -build_id=$(fedpkg-stage module-build --optional rebuild_strategy=only-changed | tail -1 | awk '{ print $3 }' | cut -c 2-) +build_id=$(fedpkg-stage module-build --optional rebuild_strategy=only-changed | tail -1 | awk '{ print $3 }') echo "Working with module build $build_id" fedpkg-stage module-build-watch $build_id url=https://mbs.stg.fedoraproject.org/module-build-service/1/module-builds/$build_id @@ -34,7 +34,7 @@ git push origin master cd ../testmodule git commit --allow-empty -m "Empty test commit, for MBS in staging." git push origin master -build_id=$(fedpkg-stage module-build --optional rebuild_strategy=only-changed | tail -1 | awk '{ print $3 }' | cut -c 2-) +build_id=$(fedpkg-stage module-build --optional rebuild_strategy=only-changed | tail -1 | awk '{ print $3 }') echo "Working with module build $build_id" fedpkg-stage module-build-watch $build_id diff --git a/contrib/test-mbs-fedora-staging-resume.sh b/contrib/test-mbs-fedora-staging-resume.sh index 523ea080..7878b08c 100755 --- a/contrib/test-mbs-fedora-staging-resume.sh +++ b/contrib/test-mbs-fedora-staging-resume.sh @@ -17,7 +17,7 @@ git push origin master cd ../testmodule git commit --allow-empty -m "Empty test commit, for MBS in staging." git push origin master -build_id=$(fedpkg-stage module-build --optional rebuild_strategy=only-changed | tail -1 | awk '{ print $3 }' | cut -c 2-) +build_id=$(fedpkg-stage module-build --optional rebuild_strategy=only-changed | tail -1 | awk '{ print $3 }') echo "Working with module build $build_id" echo "Sleeping for 10 seconds before cancelling the build." @@ -27,7 +27,7 @@ echo "Build cancellation submitted." sleep 10 echo "Submitting build again. Should resume." -build_id_two=$(fedpkg-stage module-build --optional rebuild_strategy=only-changed | tail -1 | awk '{ print $3 }' | cut -c 2-) +build_id_two=$(fedpkg-stage module-build --optional rebuild_strategy=only-changed | tail -1 | awk '{ print $3 }') if [ "$build_id_two" -ne "$build_id" ]; then echo "The module build didn't resume."; exit 1; fi