summaryrefslogtreecommitdiff
path: root/contrib/cirrus/packer/libpod_images.yml
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-01 03:23:24 +0100
committerGitHub <noreply@github.com>2019-02-01 03:23:24 +0100
commit82550ede36dab0689914c3c1b6de44b55f0d22f8 (patch)
treefcf56d191459ea7661c305f4dff91e0fae2e876b /contrib/cirrus/packer/libpod_images.yml
parent805c6d997b4eb8941e7c2a12879bf9a5284835d0 (diff)
parent10d749b9a8c36ce5d3e2dc904222863528c349f6 (diff)
downloadpodman-82550ede36dab0689914c3c1b6de44b55f0d22f8.tar.gz
podman-82550ede36dab0689914c3c1b6de44b55f0d22f8.tar.bz2
podman-82550ede36dab0689914c3c1b6de44b55f0d22f8.zip
Merge pull request #2195 from cevich/rhel7-testing
Cirrus: Add RHEL-7 testing
Diffstat (limited to 'contrib/cirrus/packer/libpod_images.yml')
-rw-r--r--contrib/cirrus/packer/libpod_images.yml13
1 files changed, 11 insertions, 2 deletions
diff --git a/contrib/cirrus/packer/libpod_images.yml b/contrib/cirrus/packer/libpod_images.yml
index d31c11a8d..30ad0723a 100644
--- a/contrib/cirrus/packer/libpod_images.yml
+++ b/contrib/cirrus/packer/libpod_images.yml
@@ -29,6 +29,10 @@ variables:
SERVICE_ACCOUNT: '{{env `SERVICE_ACCOUNT`}}'
GOOGLE_APPLICATION_CREDENTIALS: '{{env `GOOGLE_APPLICATION_CREDENTIALS`}}'
+ # Used to separate images produced during PR testing from those
+ # produced from post-merge testing. Must be empty for PR testing.
+ POST_MERGE_BUCKET_SUFFIX: ''
+
# Don't leak sensitive values in error messages / output
sensitive-variables:
- 'GCE_SSH_USERNAME'
@@ -84,13 +88,18 @@ provisioners:
- type: 'shell'
script: '{{user `GOSRC`}}/{{user `PACKER_BASE`}}/{{split build_name "-" 0}}_setup.sh'
environment_vars:
- - 'SCRIPT_BASE={{user `SCRIPT_BASE`}}'
+ - 'GOSRC=/tmp/libpod'
- 'CNI_COMMIT={{user `CNI_COMMIT`}}'
- 'FEDORA_CNI_COMMIT={{user `FEDORA_CNI_COMMIT`}}'
- 'CRIO_COMMIT={{user `CRIO_COMMIT`}}'
- 'CRIU_COMMIT={{user `CRIU_COMMIT`}}'
- 'RUNC_COMMIT={{user `RUNC_COMMIT`}}'
+ - 'SCRIPT_BASE={{user `SCRIPT_BASE`}}'
- 'RHSM_COMMAND={{user `RHSM_COMMAND`}}'
post-processors:
- - - type: 'manifest'
+ # Store VM disk in GCP storage, where it will expire based on a defined
+ # lifecycle. This prevents GCE from filling with disused images.
+ - - type: 'googlecompute-export'
+ paths: ['gs://packer-import{{user `POST_MERGE_BUCKET_SUFFIX`}}/{{build_name}}{{user `BUILT_IMAGE_SUFFIX`}}.tar.gz']
+ - type: 'manifest' # writes packer-manifest.json