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

Proposed by James Tunnicliffe
Status: Merged
Approved by: Paul Sokolovsky
Approved revision: 42
Merged at revision: 42
Proposed branch: lp:~dooferlad/linaro-license-protection/manifest_generation_fix
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 18 lines (+3/-3)
1 file modified
scripts/jenkins-post-www.sh (+3/-3)
To merge this branch: bzr merge lp:~dooferlad/linaro-license-protection/manifest_generation_fix
Reviewer Review Type Date Requested Status
Paul Sokolovsky Approve
Review via email: mp+91114@code.launchpad.net

Description of the change

Should fix up manifest generation. The old script only generated a manifest of the files being copied during that run. Since files are copied in several stages this resulted in files not being listed.

When this is deployed and after it is proved to work, we should delete all generated MANIFEST files from snapshots.linaro.org because they are incomplete and will break the web UI file listing.

To post a comment you must log in.
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

I told it would be easier to do on android-build side ;-).

Are you sure this works and as expected? We actually have 2 transfers, 1st one transfer main bunch of files, 2nd one only lava-job-info. So, I'd expect to see >>MANIFEST, or otherwise expect it to skip updating manifest if it exists, or if the file in lava-job-info (no big point to include it in artifact list imho).

review: Needs Information
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

Ok, the file is just regenerated from final d/l dir each time, works good too.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/jenkins-post-www.sh'
2--- scripts/jenkins-post-www.sh 2012-01-27 17:16:41 +0000
3+++ scripts/jenkins-post-www.sh 2012-02-01 15:54:18 +0000
4@@ -24,11 +24,11 @@
5 job_dir=$(dirname $build_path)
6 username=`echo "$job_dir" | cut -d_ -f1`
7 jobname=`echo "$job_dir" | cut -d_ -f2-`
8-pushd $BASE_PATH/$build_path
9-find * -xtype f > MANIFEST
10-popd
11+
12 echo -n "Moving $BASE_PATH/$build_path to $TARGET_PATH/~$username/$jobname/... " &&
13 (mkdir -p "$TARGET_PATH/~$username/$jobname" && \
14 cp -a $BASE_PATH/"$build_path" "$TARGET_PATH/~$username/$jobname/" && \
15 rm -rf $BASE_PATH/"$build_path" && \
16 echo "done")
17+
18+cd "$TARGET_PATH/~$username/$jobname/" && find * -xtype f > MANIFEST

Subscribers

People subscribed via source and target branches