summaryrefslogtreecommitdiffstats
path: root/wiki/src/blueprint/automated_builds_and_tests
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-09-25 15:33:20 +0000
committerintrigeri <intrigeri@boum.org>2015-09-25 15:33:20 +0000
commitca5bf583712062938b6d5ecd5710b75d30b99a59 (patch)
tree4a232cee4f625a2e97e27744dd52e9425035e406 /wiki/src/blueprint/automated_builds_and_tests
parent3aa178c64aef46602eaf08dcd924080f7526c769 (diff)
Make it clear that this other option wasn't discussed nor agreed upon.
Diffstat (limited to 'wiki/src/blueprint/automated_builds_and_tests')
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn12
1 files changed, 6 insertions, 6 deletions
diff --git a/wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn b/wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn
index bc9b93a..1d0eb88 100644
--- a/wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn
+++ b/wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn
@@ -296,17 +296,17 @@ we'll have to merge the base branch before we look at that config
setting (because for some reason the base branch might itself require
old ISO = same).
-So let use a simpler solution using existing code in the repo: use the
-`OLD_TAILS_ISO` flag present in `config/default.yml`: when we release we
-set its value to the released ISO, and for some branch that need it we
-empty this variable so that the test use the same ISO for both
-`--old-iso` and `--iso`.
-
As a first baby step, we will by default use the same ISO for both
`--old-iso` and `--iso`, except for the branches used to prepare
releases (`devel` and `stable`), so that we
know if the upgrades are broken long before the next release.
+Another option that could be considered, using existing code in the repo: use the
+`OLD_TAILS_ISO` flag present in `config/default.yml`: when we release we
+set its value to the released ISO, and for some branch that need it we
+empty this variable so that the test use the same ISO for both
+`--old-iso` and `--iso`.
+
Retrieving the ISOs for the test
--------------------------------