summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2015-10-18 13:28:49 +0200
committerbertagaz <bertagaz@ptitcanardnoir.org>2015-10-18 13:28:49 +0200
commit7683f0fc06cff390e9d82c48e9b7723f16dea434 (patch)
treee47dfad9573b6140f329f222409ae67f1e507fab
parent638798d69346619c9da0cc206a3d4b9f7a9e4ff0 (diff)
parentabd02c4d4093e334fe1067a7cbc48140f35b3332 (diff)
Merge branch 'master' into feature/10287-limited-email-notificationsfeature/10287-limited-email-notifications
-rwxr-xr-xfiles/jenkins/slaves/isotesters/post_test_cleanup2
-rw-r--r--files/jenkins/slaves/isotesters/test_suite_temp_wrapper1
-rw-r--r--files/jenkins/slaves/isotesters/wrap_test_suite3
-rw-r--r--manifests/jenkins/master.pp4
4 files changed, 6 insertions, 4 deletions
diff --git a/files/jenkins/slaves/isotesters/post_test_cleanup b/files/jenkins/slaves/isotesters/post_test_cleanup
index 8a6fd6b..16fd939 100755
--- a/files/jenkins/slaves/isotesters/post_test_cleanup
+++ b/files/jenkins/slaves/isotesters/post_test_cleanup
@@ -16,7 +16,7 @@ sudo -n chown -R jenkins "${TEMP_DIR}"/*
mkdir -p "${WORKSPACE}/build-artifacts"
-find "${TEMP_DIR}" -maxdepth 1 \
+find "${TEMP_DIR}" \
\( -name '*.png' -o -name 'debug.log' -o -name '*.mkv' -o -name '*.pcap' \) \
-print0 | \
xargs -0 -r cp -t "${WORKSPACE}/build-artifacts/"
diff --git a/files/jenkins/slaves/isotesters/test_suite_temp_wrapper b/files/jenkins/slaves/isotesters/test_suite_temp_wrapper
index 4ffeb5b..a87153b 100644
--- a/files/jenkins/slaves/isotesters/test_suite_temp_wrapper
+++ b/files/jenkins/slaves/isotesters/test_suite_temp_wrapper
@@ -39,6 +39,7 @@ as_root_do ./run_test_suite \
--old-iso "${PREVIOUS_ISO}" \
--iso "${ISO}" \
-- \
+ --tag ~@fragile \
--format json --out ${TEMP_DIR}/tailstester.json \
--format debug --out ${TEMP_DIR}/debug.log \
--format pretty
diff --git a/files/jenkins/slaves/isotesters/wrap_test_suite b/files/jenkins/slaves/isotesters/wrap_test_suite
index f4a5cc1..3c886fb 100644
--- a/files/jenkins/slaves/isotesters/wrap_test_suite
+++ b/files/jenkins/slaves/isotesters/wrap_test_suite
@@ -30,7 +30,7 @@ as_root_do() {
get_last_released_iso() {
local release_version="$1"
local previous_iso="$2"
- wget --no-check-certificate "${ISO_HISTORY_URL}/tails-i386-${release_version}/${previous_iso}"
+ wget --no-verbose --no-check-certificate "${ISO_HISTORY_URL}/tails-i386-${release_version}/${previous_iso}"
}
git reset --hard "${UPSTREAMJOB_GIT_COMMIT}"
@@ -71,6 +71,7 @@ as_root_do ./run_test_suite \
--iso "${UPSTREAMJOB_ISO}" \
--capture \
-- \
+ --tag ~@fragile \
--format json --out "${TMP_DIR}/tailstester.json" \
--format debug --out "${TMP_DIR}/debug.log" \
--format pretty
diff --git a/manifests/jenkins/master.pp b/manifests/jenkins/master.pp
index 3b60263..800b110 100644
--- a/manifests/jenkins/master.pp
+++ b/manifests/jenkins/master.pp
@@ -70,8 +70,8 @@ class tails::jenkins::master (
Nfs::Export <<| tag == $::fqdn |>>
jenkins::plugin { 'build-timeout':
- version => '1.14.1',
- digest_string => 'c47ac41223a62c72b76fceb032919f17ed509d1204b038e0a89301e3ddcab3294f976440db759a966e8176ce292df9aaca27d5ab07246ae8548869d8001cfcb2',
+ version => '1.15',
+ digest_string => '8d70a0a9fa49b154add655df2c41914106c6b5e7bcc7017749bc02b8aea2cea2ad5b955a832982de967acde677dc15b7a6991ad45139434ddcdf186227934f9e',
digest_type => 'sha512',
}