tcwg_kernel-bisect.sh: Fix handling of manifest files

Move manifest files of individual builds to a dedicated manifests/
directory, which is preserved across runs.  This fixes bisect
reproductions, which previously broke due to manifests in
[downloaded] artifacts being removed at the start of this script
while cleaning artifacts directory.

Change-Id: Ieffbb9d482943398a332cd51466f8116e905c170

1 files changed, 16 insertions, 14 deletions

diff --git a/tcwg_kernel-bisect.sh b/tcwg_kernel-bisect.sh
index 0c025c07..9c10d052 100755
--- a/tcwg_kernel-bisect.sh
+++ b/tcwg_kernel-bisect.sh
@@ -6,8 +6,8 @@ scripts=$(dirname $0)
 . $scripts/jenkins-helpers.sh
 
 artifacts=$(pwd)/artifacts
-rm -rf $artifacts
-mkdir $artifacts
+
+fresh_dir $artifacts "$artifacts/manifests/*"
 
 # Process bisect-only args
 convert_args_to_variables "$@"
@@ -19,8 +19,8 @@ BUILD_URL="${BUILD_URL:-$(pwd)}"
 confirm_failure="${confirm_failure:-false}"
 reproduce_bisect="${reproduce_bisect:-false}"
 
-# Process build args and record them in build-manifest.sh
-convert_args_to_variables %% $artifacts/build-manifest.sh "$@"
+# Process build args and record them in build-parameters.sh
+convert_args_to_variables %% $artifacts/build-parameters.sh "$@"
 
 obligatory_variables current_project toolchain
 
@@ -39,8 +39,8 @@ if $confirm_failure; then
     echo "Testing bad_rev $bad_rev (hoping for failure)"
     $scripts/tcwg_kernel-build.sh \
 	^^ $reproduce_bisect \
-	%% $artifacts/build-bad/jenkins/manifest.sh \
-	@@ $artifacts/build-manifest.sh \
+	%% $artifacts/manifests/build-bad.sh \
+	@@ $artifacts/build-parameters.sh \
 	--mode "baseline" \
 	--current_rev "$bad_rev" \
 	--top_artifacts "$artifacts/build-bad" \
@@ -58,6 +58,7 @@ EOF
 	exit 0
     fi
     mv "$artifacts/build-bad" "$artifacts/build-$bad_rev-bad"
+    mv "$artifacts/manifests/build-bad.sh" "$artifacts/manifests/build-$bad_rev.sh"
     echo "$bad_rev" >> $artifacts/bad_revs
 elif [ x"$bad_rev" = x"default" ]; then
     echo "ERROR: Need explicit --bad_rev"
@@ -71,8 +72,8 @@ fi
 echo "Testing baseline_rev $baseline_rev (should be success)"
 $scripts/tcwg_kernel-build.sh \
     ^^ $reproduce_bisect \
-    %% $artifacts/build-baseline/jenkins/manifest.sh \
-    @@ $artifacts/build-manifest.sh \
+    %% $artifacts/manifests/build-baseline.sh \
+    @@ $artifacts/build-parameters.sh \
     --mode "baseline" \
     --current_rev "$baseline_rev" \
     --reset_baseline true \
@@ -87,6 +88,7 @@ cd $current_project
 good_rev=$(git rev-parse HEAD)
 baseline_rev="$good_rev"
 mv "$artifacts/build-baseline" "$artifacts/build-$baseline_rev-baseline"
+mv "$artifacts/manifests/build-baseline.sh" "$artifacts/manifests/build-$baseline_rev.sh"
 echo "$baseline_rev" >> $artifacts/good_revs
 
 cat <<EOF | manifest_out
@@ -124,8 +126,8 @@ rev=\$(git rev-parse HEAD)
 cd ..
 $scripts/tcwg_kernel-build.sh \
   ^^ $reproduce_bisect \
-  %% $artifacts/build-\$rev/jenkins/manifest.sh \
-  @@ $artifacts/build-manifest.sh \
+  %% $artifacts/manifests/build-\$rev.sh \
+  @@ $artifacts/build-parameters.sh \
   --mode bisect \
   --top_artifacts $artifacts/build-\$rev \
   --verbose "$verbose" &
@@ -342,13 +344,13 @@ cd investigate-$current_project-$bad_sha1
 git clone https://git.linaro.org/toolchain/jenkins-scripts
 mkdir reproduce-$good_name
 cd reproduce-$good_name
-wget ${BUILD_URL}artifact/artifacts/build-$good_sha1-$good_name/jenkins/manifest.sh
-../jenkins-scripts/tcwg_kernel-build.sh @@ manifest.sh
+wget ${BUILD_URL}artifact/artifacts/manifests/build-$good_sha1.sh
+../jenkins-scripts/tcwg_kernel-build.sh @@ build-$good_sha1.sh
 cd ..
 mkdir reproduce-$bad_name
 cd reproduce-$bad_name
-wget ${BUILD_URL}artifact/artifacts/build-$bad_sha1-$bad_name/jenkins/manifest.sh
-../jenkins-scripts/tcwg_kernel-build.sh @@ manifest.sh
+wget ${BUILD_URL}artifact/artifacts/manifests/build-$bad_sha1.sh
+../jenkins-scripts/tcwg_kernel-build.sh @@ build-$bad_sha1.sh
 cd ..
 </cut>