Merge lp:~dooferlad/linaro-license-protection/MANIFEST_generation_fix_and_test into lp:~linaro-automation/linaro-license-protection/trunk

[James Tunnicliffe]

Unfortunately the last change to MANIFEST generation didn't create MANIFEST files in the correct directory. This one does, and it now has a test, which clearly it needed all the time since there have been so many fixes to it.

[Paul Sokolovsky (pfalcon)]

Writing tests in shell is fun ;-). I'd at least add set -e there.

review: Approve

=== modified file 'scripts/jenkins-post-www.sh'
--- scripts/jenkins-post-www.sh	2012-02-01 15:49:30 +0000
+++ scripts/jenkins-post-www.sh	2012-02-02 12:52:19 +0000
@@ -5,6 +5,14 @@
 # Expected argument: ~username_jobname/buildno
 build_path="$1"
 
+if [[ -n $2 ]]; then
+    BASE_PATH=$2
+fi
+
+if [[ -n $3 ]]; then
+    TARGET_PATH=$3
+fi
+
 if [ -z "$build_path" ]; then
     echo "Missing build path"
     exit 1;
@@ -22,6 +30,7 @@
 fi
 
 job_dir=$(dirname $build_path)
+build_number=$(basename $build_path)
 username=`echo "$job_dir" | cut -d_ -f1`
 jobname=`echo "$job_dir" | cut -d_ -f2-`
 
@@ -31,4 +40,4 @@
      rm -rf $BASE_PATH/"$build_path" && \
      echo "done")
 
-cd "$TARGET_PATH/~$username/$jobname/" && find * -xtype f > MANIFEST
+cd "$TARGET_PATH/~$username/$jobname/$build_number" && find * -xtype f > MANIFEST

=== added file 'scripts/test_jenkins-post-www.sh_test_structure.sh'
--- scripts/test_jenkins-post-www.sh_test_structure.sh	1970-01-01 00:00:00 +0000
+++ scripts/test_jenkins-post-www.sh_test_structure.sh	2012-02-02 12:52:19 +0000
@@ -0,0 +1,45 @@
+#/bin/env bash
+
+# Test MANIFEST creation for jenkins-post-www.sh
+
+root=`mktemp -d`
+
+mkdir -p $root/from/user_build/1/subdir/anotherdir/yetanotherdir
+touch $root/from/user_build/1/file1
+touch $root/from/user_build/1/file2
+touch $root/from/user_build/1/file3
+touch $root/from/user_build/1/subdir/subfile1
+touch $root/from/user_build/1/subdir/subfile2
+touch $root/from/user_build/1/subdir/subfile3
+
+mkdir -p $root/from/user_build/2/subdir/anotherdir/yetanotherdir
+touch $root/from/user_build/2/file1
+touch $root/from/user_build/2/file2
+touch $root/from/user_build/2/file3
+touch $root/from/user_build/2/subdir/subfile1
+touch $root/from/user_build/2/subdir/subfile2
+touch $root/from/user_build/2/subdir/subfile3
+
+mkdir -p $root/to
+
+./jenkins-post-www.sh user_build/1 $root/from $root/to
+
+# MANIFEST should list all files, but no directories, in $root/from/user_build/1
+
+cat > $root/expected << EOF
+file1
+file2
+file3
+subdir/subfile3
+subdir/subfile2
+subdir/subfile1
+EOF
+
+diff $root/expected $root/to/~user/build/1/MANIFEST
+if [[ $? == 0 ]]; then
+    echo "Passed"
+else
+    echo "Failed"
+fi
+
+rm -r $root