summaryrefslogtreecommitdiff
path: root/contrib/cirrus/README.md
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-04-30 13:09:32 -0400
committerChris Evich <cevich@redhat.com>2019-05-21 08:44:02 -0400
commit95141f88d4e6f994c2972a63be19c82ef759ea5b (patch)
treef177ca42941649f7a88921f3d15b52bf8c8eb2ee /contrib/cirrus/README.md
parentc4d9b03f7800e37df0a8821b450932700aac3c5d (diff)
downloadpodman-95141f88d4e6f994c2972a63be19c82ef759ea5b.tar.gz
podman-95141f88d4e6f994c2972a63be19c82ef759ea5b.tar.bz2
podman-95141f88d4e6f994c2972a63be19c82ef759ea5b.zip
Cirrus: fixups based on review feedback
Also remove disused distros (RHEL/CentOS/FAH) and fix get_ci_vm script Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/README.md')
-rw-r--r--contrib/cirrus/README.md29
1 files changed, 8 insertions, 21 deletions
diff --git a/contrib/cirrus/README.md b/contrib/cirrus/README.md
index 1d62f71ce..69d8653fe 100644
--- a/contrib/cirrus/README.md
+++ b/contrib/cirrus/README.md
@@ -136,11 +136,10 @@ you'll find the new image names displayed at the end of the
`test_build_cache_images_task` in the `build_vm_images` output.
For example:
+
```
...cut...
==> Builds finished. The artifacts of successful builds are:
---> rhel-7: A disk image was created: rhel-7-libpod-5699523102900224
---> rhel-7:
--> ubuntu-18: A disk image was created: ubuntu-18-libpod-5699523102900224
--> ubuntu-18:
--> fedora-29: A disk image was created: fedora-29-libpod-5699523102900224
@@ -148,8 +147,8 @@ For example:
--> fedora-28: A disk image was created: fedora-28-libpod-5699523102900224
```
-An updated (or new) pull-request with this change, will utilize
-the new cache-images:
+Now edit `.cirrus.yml`, updating the `*_IMAGE_NAME` lines to reflect the
+images from above:
```yaml
@@ -161,14 +160,14 @@ env:
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5699523102900224"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5699523102900224"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5699523102900224"
- PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-5699523102900224"
...cut...
```
-Take care to also update the PR description if any 'magic' phrases were used
-(they affect which tests run). In other words, you'll likely want to
-remove the ``***CIRRUS: TEST IMAGES***`` string - otherwise Cirrus-CI will
-simply build new and test again.
+***NOTE:*** If re-using the same PR with new images in `.cirrus.yml`,
+take care to also *update the PR description* to remove
+the magic ``***CIRRUS: TEST IMAGES***`` string. Keeping it and
+`--force` pushing would needlessly cause Cirrus-CI to build
+and test images again.
### ``build_cache_images`` Task *(Deprecated)*
@@ -216,15 +215,6 @@ the ``cache_images`` Task) some input parameters are required:
or [end-user
credentials](https://cloud.google.com/docs/authentication/end-user#creating_your_client_credentials)
-* ``RHEL_IMAGE_FILE`` and ``RHEL_CSUM_FILE`` complete paths
- to a `rhel-server-ec2-*.raw.xz` and it's cooresponding
- checksum file. These must be supplied manually because
- they're not available directly via URL like other images.
-
-* ``RHSM_COMMAND`` contains the complete string needed to register
- the VM for installing package dependencies. The VM will be de-registered
- upon completion.
-
* Optionally, CSV's may be specified to ``PACKER_BUILDS``
to limit the base-images produced. For example,
``PACKER_BUILDS=fedora,image-builder-image``.
@@ -270,9 +260,6 @@ When ready, change to the ``packer`` sub-directory, and build the images:
$ cd libpod/contrib/cirrus/packer
$ make libpod_base_images GCP_PROJECT_ID=<VALUE> \
GOOGLE_APPLICATION_CREDENTIALS=<VALUE> \
- RHEL_IMAGE_FILE=<VALUE> \
- RHEL_CSUM_FILE=<VALUE> \
- RHSM_COMMAND=<VALUE> \
PACKER_BUILDS=<OPTIONAL>
```