Merge lp:~danilo/linaro-android-build-tools/bug-1076283 into lp:linaro-android-build-tools

Proposed by Данило Шеган
Status: Merged
Merged at revision: 542
Proposed branch: lp:~danilo/linaro-android-build-tools/bug-1076283
Merge into: lp:linaro-android-build-tools
Diff against target: 17 lines (+4/-2)
1 file modified
utils/mangle-jobs/push-artifacts-set.mangle (+4/-2)
To merge this branch: bzr merge lp:~danilo/linaro-android-build-tools/bug-1076283
Reviewer Review Type Date Requested Status
Milo Casagrande (community) Approve
Review via email: mp+138972@code.launchpad.net

Description of the change

Builds like https://android-build.linaro.org/builds/~linaro-android/origen-jb-gcc47-samsunglt-stable-blob/ have EULA.txt files in the target/product/origen/system/... subdirectories, which results in those directories being published as well.

We don't want to copy these files over, so we need to update the file pattern in jenkins job configuration for files that we publish.

To post a comment you must log in.
542. By Данило Шеган

Cover EULA.txt files as well.

Revision history for this message
Milo Casagrande (milo) wrote :

I guess we do not have tests for those files...
It looks OK for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utils/mangle-jobs/push-artifacts-set.mangle'
2--- utils/mangle-jobs/push-artifacts-set.mangle 2012-11-06 06:43:21 +0000
3+++ utils/mangle-jobs/push-artifacts-set.mangle 2012-12-10 13:49:20 +0000
4@@ -10,9 +10,11 @@
5 "build/out/lava-job-info," \
6 "build/out/linaro_kernel_build_cmds.sh," \
7 "build/out/linaro_android_build_cmds.sh," \
8- "build/out/**/*EULA*," \
9+ "build/out/*EULA*," \
10+ "build/out/target/product/*/*EULA*," \
11+ "build/out/target/product/*/howto/*EULA*," \
12 "build/out/**/BUILD-INFO.txt," \
13- "build/out/target/**/howto/HOWTO_*.txt"
14+ "build/out/target/product/*/howto/HOWTO_*.txt"
15
16 def mangle(tree):
17 nodes = tree.xpath('//jenkins.plugins.publish__over__ssh.BapSshTransfer/sourceFiles')

Subscribers

People subscribed via source and target branches