From b053d7a07ba5b07df8b3af812890236a3525e49c Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Wed, 27 Nov 2024 14:06:47 +0100 Subject: [PATCH 1/2] Ensure staging project is also cleaned up in case of an early return Related ticket: https://progress.opensuse.org/issues/167395 --- os-autoinst-obs-auto-submit | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/os-autoinst-obs-auto-submit b/os-autoinst-obs-auto-submit index 5e72db8..78f4def 100644 --- a/os-autoinst-obs-auto-submit +++ b/os-autoinst-obs-auto-submit @@ -165,9 +165,6 @@ handle_auto_submit() { cd "$dst_project"/"$package" update_package "$package" ) - - # delete package from staging project - [[ $from_staging ]] && $osc rdelete -m "Cleaning up $package from $staging_project for next submission" "$staging_project" "$package" } prefix="${prefix:-""}" @@ -185,5 +182,7 @@ trap 'rm -rf "$TMPDIR"' EXIT auto_submit_packages=${packages:-$($osc ls "$dst_project" | grep -v '\-test$')} for package in $auto_submit_packages; do handle_auto_submit "$package" + # delete package from staging project + [[ $from_staging ]] && $osc rdelete -m "Cleaning up $package from $staging_project for next submission" "$staging_project" "$package" done ) From 75512a61864ed92a82f877339f1f0997f9a4dec9 Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Wed, 27 Nov 2024 14:18:29 +0100 Subject: [PATCH 2/2] Make os-autoinst-obs-auto-submit executable to run it on Jekins We already execute other scripts from Git on Jenkins. Only this script is not executable and downloaded via `curl`. With this change we can run it on Jenkins like the others. This is now also required because it otherwise cannot source `_common`. Related ticket: https://progress.opensuse.org/issues/167395 --- os-autoinst-obs-auto-submit | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 os-autoinst-obs-auto-submit diff --git a/os-autoinst-obs-auto-submit b/os-autoinst-obs-auto-submit old mode 100644 new mode 100755