Fix the integration scripts when using the latest rpkg code

This commit is contained in:
mprahl
2018-04-05 15:46:49 -04:00
parent 6cc577b4b9
commit 2c0f6b2f94
3 changed files with 5 additions and 5 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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