diff options
author | Lars Wirzenius <liw@liw.fi> | 2015-06-24 21:30:40 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2015-06-25 18:48:14 +0300 |
commit | 007c4a8475106fe9fa510d39ff21246023efb03b (patch) | |
tree | 6797f4605869adf9c233790f0b4f9fd58833a82f | |
parent | e54e35644f408cf0b2762fb2ab5a89231013991c (diff) | |
download | ick-007c4a8475106fe9fa510d39ff21246023efb03b.tar.gz |
Add test for ick building CI and release both
-rwxr-xr-x | check | 3 | ||||
-rw-r--r-- | doc/040-simple.yarn | 12 | ||||
-rw-r--r-- | doc/070-pipeline.yarn | 14 | ||||
-rw-r--r-- | doc/900-implements.yarn | 2 |
4 files changed, 22 insertions, 9 deletions
@@ -25,6 +25,7 @@ rm .coverage yarn --env "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" \ --env "PYTHONPATH=$PYTHONPATH" \ - --env "ICK_TEST_TARGET=$ICK_TEST_TARGET" \ + --env "ICK_UNSTABLE_TEST_TARGET=$ICK_UNSTABLE_TEST_TARGET" \ + --env "ICK_JESSIE_TEST_TARGET=$ICK_JESSIE_TEST_TARGET" \ "$@"\ <(sed '/^ EXAMPLE/,/^ *$/d' doc/*.yarn) diff --git a/doc/040-simple.yarn b/doc/040-simple.yarn index 2a82d4b..36dd5f6 100644 --- a/doc/040-simple.yarn +++ b/doc/040-simple.yarn @@ -6,11 +6,13 @@ scenario testing language. SCENARIO build simple project -For running these tests, the caller must set the `ICK_TEST_TARGET` -environment variable to an address that can be reached by ssh and -where `sudo pbuilder` can be run. +For running these tests, the caller must set the +`ICK_UNSTABLE_TEST_TARGET` and `ICK_JESSIE_TEST_TARGET` environment +variables to addresses that can be reached by ssh and where `sudo +pbuilder` can be run without interactive password entry. - GIVEN the ICK_TEST_TARGET variable is set + GIVEN the ICK_UNSTABLE_TEST_TARGET variable is set + AND the ICK_JESSIE_TEST_TARGET variable is set First of all, we need to have a project we build. We call the project FOO. For this example, it can be empty, since we don't actually need @@ -30,7 +32,7 @@ passphrase or a login password all the time. ... "state": "KITTEN.state", ... "targets": { ... "test": { - ... "address": "$ICK_TEST_TARGET", + ... "address": "$ICK_UNSTABLE_TEST_TARGET", ... "pbuilder-ci-tgz": "/var/cache/pbuilder/ci.tgz" ... } ... }, diff --git a/doc/070-pipeline.yarn b/doc/070-pipeline.yarn index 3430cd2..2db41cb 100644 --- a/doc/070-pipeline.yarn +++ b/doc/070-pipeline.yarn @@ -16,9 +16,17 @@ Then we need an Ick file. ... { ... "state": "foo.state", ... "targets": { - ... "test": { - ... "address": "$ICK_TEST_TARGET", + ... "ci_unstable": { + ... "address": "$ICK_UNSTABLE_TEST_TARGET", ... "pbuilder-ci-tgz": "/var/cache/pbuilder/ci.tgz" + ... }, + ... "release_jessie": { + ... "address": "$ICK_JESSIE_TEST_TARGET", + ... "pbuilder-ci-tgz": "/var/cache/pbuilder/release.tgz" + ... }, + ... "release_unstable": { + ... "address": "$ICK_UNSTABLE_TEST_TARGET", + ... "pbuilder-ci-tgz": "/var/cache/pbuilder/release.tgz" ... } ... }, ... "projects": { @@ -35,3 +43,5 @@ Then we do the build. WHEN user runs ick foo.ick THEN the APT repository for foo.ick contains foo_3.2.ci1-1.unstable.dsc THEN the APT repository for foo.ick contains foo_3.2.ci1-1.unstable_all.deb + THEN the APT repository for foo.ick contains foo_3.2-1.debian8.0_all.deb + THEN the APT repository for foo.ick contains foo_3.2-1_all.deb diff --git a/doc/900-implements.yarn b/doc/900-implements.yarn index de7c52c..ad34dcf 100644 --- a/doc/900-implements.yarn +++ b/doc/900-implements.yarn @@ -8,7 +8,7 @@ you can skip this chapter. ## Checking that the target address is set IMPLEMENTS GIVEN the (.+) variable is set - env | grep -F "$MATCH_1" + env | grep -F "$MATCH_1=" ## Git repository setup |