summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2016-04-23 21:35:51 +0200
committerbertagaz <bertagaz@ptitcanardnoir.org>2016-04-23 21:35:51 +0200
commita421a35a91a78775178db21fd35df7e7820d2ef2 (patch)
treeede54f0a4939a13ac542edd6348b9c12e618e7ad
parenteb06c31cf1c67c66348cd069e22de6e362347709 (diff)
Manually add and remove custom chutney torrc template.
Workarounding wile #11364 is not resolved. We can revert this commit once it is. Refs: #11352, #11364
-rwxr-xr-xfiles/jenkins/slaves/isotesters/post_test_cleanup7
-rw-r--r--files/jenkins/slaves/isotesters/wrap_test_suite7
2 files changed, 14 insertions, 0 deletions
diff --git a/files/jenkins/slaves/isotesters/post_test_cleanup b/files/jenkins/slaves/isotesters/post_test_cleanup
index 16fd939..32fe5c4 100755
--- a/files/jenkins/slaves/isotesters/post_test_cleanup
+++ b/files/jenkins/slaves/isotesters/post_test_cleanup
@@ -12,6 +12,13 @@ TEMP_DIR="$2"
[ -d "$WORKSPACE" ] || exit 4
[ -d "$TEMP_DIR" ] || exit 5
+CHUTNEY_TEMPLATES=$(find "${WORKSPACE}/features/chutney/" -type f -name '*.tmpl')
+
+for template in "${CHUTNEY_TEMPLATES}"; do
+ dest_file=$(basename "${template}")
+ sudo rm -f "/var/lib/chutney/torrc_templates/${dest_file}"
+done
+
sudo -n chown -R jenkins "${TEMP_DIR}"/*
mkdir -p "${WORKSPACE}/build-artifacts"
diff --git a/files/jenkins/slaves/isotesters/wrap_test_suite b/files/jenkins/slaves/isotesters/wrap_test_suite
index b2f53e2..3bde16b 100644
--- a/files/jenkins/slaves/isotesters/wrap_test_suite
+++ b/files/jenkins/slaves/isotesters/wrap_test_suite
@@ -77,6 +77,13 @@ if [ "${UPSTREAMJOB_GIT_COMMIT}" != "${UPSTREAMJOB_GIT_BASE_BRANCH_HEAD}" ] && \
TAGS_ARGS="${TAGS_ARGS} --tag @doc"
fi
+CHUTNEY_TEMPLATES=$(find "${WORKSPACE}/features/chutney/" -type f -name '*.tmpl')
+
+for template in "${CHUTNEY_TEMPLATES}"; do
+ dest_file=$(basename "${template}")
+ as_root_do ln -s "${template}" "/var/lib/chutney/torrc_templates/${dest_file}"
+done
+
as_root_do ./run_test_suite \
--old-iso "${PREVIOUS_ISO}" \
--iso "${UPSTREAMJOB_ISO}" \