Skip to content
Snippets Groups Projects
Commit c2f70796 authored by Oz Linden's avatar Oz Linden
Browse files

make all upload failures fatal

parent 7a5fbe8d
No related branches found
No related tags found
No related merge requests found
...@@ -247,7 +247,8 @@ do ...@@ -247,7 +247,8 @@ do
if [ -r "$build_dir/autobuild-package.xml" ] if [ -r "$build_dir/autobuild-package.xml" ]
then then
begin_section "Autobuild metadata" begin_section "Autobuild metadata"
python_cmd "$helpers/codeticket.py" addoutput "Autobuild Metadata" "$build_dir/autobuild-package.xml" --mimetype text/xml python_cmd "$helpers/codeticket.py" addoutput "Autobuild Metadata" "$build_dir/autobuild-package.xml" --mimetype text/xml \
|| fatal "Upload of autobuild metadata failed"
if [ "$arch" != "Linux" ] if [ "$arch" != "Linux" ]
then then
record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh
...@@ -268,7 +269,8 @@ do ...@@ -268,7 +269,8 @@ do
if [ -d "$build_dir/doxygen/html" ] if [ -d "$build_dir/doxygen/html" ]
then then
tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html" tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html"
python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2" python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2" \
|| fatal "Upload of doxygen tarball failed"
fi fi
;; ;;
*) *)
...@@ -330,11 +332,13 @@ then ...@@ -330,11 +332,13 @@ then
begin_section "Upload Debian Repository" begin_section "Upload Debian Repository"
for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do
deb_pkg=$(basename "$deb_file" | sed 's,_.*,,') deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" $deb_file python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" $deb_file \
|| fatal "Upload of debian $deb_pkg failed"
done done
for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
deb_pkg=$(basename "$deb_file" | sed 's,_.*,,') deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" "$deb_file" --private python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" "$deb_file" --private \
|| fatal "Upload of debian $deb_pkg failed"
done done
create_deb_repo create_deb_repo
...@@ -370,7 +374,8 @@ then ...@@ -370,7 +374,8 @@ then
succeeded=$build_coverity succeeded=$build_coverity
else else
# Upload base package. # Upload base package.
python_cmd "$helpers/codeticket.py" addoutput Installer "$package" python_cmd "$helpers/codeticket.py" addoutput Installer "$package" \
|| fatal "Upload of installer failed"
# Upload additional packages. # Upload additional packages.
for package_id in $additional_packages for package_id in $additional_packages
...@@ -378,7 +383,8 @@ then ...@@ -378,7 +383,8 @@ then
package=$(installer_$arch "$package_id") package=$(installer_$arch "$package_id")
if [ x"$package" != x ] if [ x"$package" != x ]
then then
python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package" python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package" \
|| fatal "Upload of installer $package_id failed"
else else
record_failure "Failed to find additional package for '$package_id'." record_failure "Failed to find additional package for '$package_id'."
fi fi
...@@ -389,7 +395,9 @@ then ...@@ -389,7 +395,9 @@ then
# Upload crash reporter files # Upload crash reporter files
for symbolfile in $symbolfiles for symbolfile in $symbolfiles
do do
python_cmd "$helpers/codeticket.py" addoutput "Symbolfile $(basename "$build_dir/$symbolfile")" "$build_dir/$symbolfile" symfile=$(basename "$build_dir/$symbolfile")
python_cmd "$helpers/codeticket.py" addoutput "Symbolfile $symfile" "$build_dir/$symbolfile" \
|| fatal "Upload of symbolfile $symfile failed"
done done
# Upload the llphysicsextensions_tpv package, if one was produced # Upload the llphysicsextensions_tpv package, if one was produced
...@@ -397,7 +405,8 @@ then ...@@ -397,7 +405,8 @@ then
if [ -r "$build_dir/llphysicsextensions_package" ] if [ -r "$build_dir/llphysicsextensions_package" ]
then then
llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package) llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private \
|| fatal "Upload of physics extensions package failed"
fi fi
;; ;;
*) *)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment