diff options
| author | kwadronaut <kwadronaut@leap.se> | 2018-04-22 15:20:38 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2018-05-28 15:36:13 +0200 |
| commit | 1de4fe1de57387ca937055257bee5b5b176bae69 (patch) | |
| tree | 9063332b106c8ee5b4bd638182bce7c49d158d32 /tests/platform-ci | |
| parent | 09031d90055e80c8101f06951b824f5c7fa96e14 (diff) | |
CI use a stretch image
'deploy_test:jessie:master' will deploy to jessie, the packages that are
in the 'master' debian repository (stable), the 'except master, stretch'
will tell it to not deploy when something to these branches is pushed.
Fixes #8920
Related #8916
Diffstat (limited to 'tests/platform-ci')
| -rwxr-xr-x | tests/platform-ci/ci-build.sh | 1 | ||||
| -rw-r--r-- | tests/platform-ci/provider/cloud.json.template | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/platform-ci/ci-build.sh b/tests/platform-ci/ci-build.sh index 59b399ee..5856fbb7 100755 --- a/tests/platform-ci/ci-build.sh +++ b/tests/platform-ci/ci-build.sh @@ -132,6 +132,7 @@ build_from_scratch() { [ -z "$AWS_SECRET_KEY" ] && fail "\$AWS_SECRET_KEY is not set - please provide it as env variable." /usr/bin/jq ".platform_ci.auth |= .+ {\"aws_access_key_id\":\"$AWS_ACCESS_KEY\", \"aws_secret_access_key\":\"$AWS_SECRET_KEY\"}" < cloud.json.template > cloud.json + # Enable xtrace again only if it was set at beginning of script [[ $xtrace == true ]] && set -x diff --git a/tests/platform-ci/provider/cloud.json.template b/tests/platform-ci/provider/cloud.json.template index 28152e82..18faf40f 100644 --- a/tests/platform-ci/provider/cloud.json.template +++ b/tests/platform-ci/provider/cloud.json.template @@ -7,7 +7,7 @@ "aws_access_key_id": "", "aws_secret_access_key": "" }, - "default_image": "ami-2a34e94a", + "default_image": "ami-310d6c49", "default_options": { "InstanceType": "t2.small" } |