Merge pull request #1788 from cevich/cirrus_base_images

Codify and document base-image production + Enable testing with Fedora

1 files changed, 138 insertions, 28 deletions

diff --git a/contrib/cirrus/README.md b/contrib/cirrus/README.md
index fa233a2cb..c5c976358 100644
--- a/contrib/cirrus/README.md
+++ b/contrib/cirrus/README.md
@@ -5,6 +5,7 @@
 Similar to other integrated github CI/CD services, Cirrus utilizes a simple
 YAML-based configuration/description file: ``.cirrus.yml``.  Ref: https://cirrus-ci.org/
 
+
 ## Workflow
 
 All tasks execute in parallel, unless there are conditions or dependencies
@@ -12,24 +13,34 @@ which alter this behavior.  Within each task, each script executes in sequence,
 so long as any previous script exited successfully.  The overall state of each
 task (pass or fail) is set based on the exit status of the last script to execute.
 
-### ``full_vm_testing`` Task
 
-1. Unconditionally, spin up one VM per ``matrix: image_name`` item defined
-   in ``.cirrus.yml``.  Once accessible, ``ssh`` into each VM and run the following
-   scripts.
+### ``gating`` Task
+
+***N/B: Steps below are performed by automation***
+
+1. Launch a purpose-built container in Cirrus's community cluster.
+   For container image details, please see
+   [the contributors guide](https://github.com/containers/libpod/blob/master/CONTRIBUTING.md#go-format-and-lint).
+
+3. ``validate``: Perform standard `make validate` source verification,
+   Should run for less than a minute or two.
+
+4. ``lint``: Execute regular `make lint` to check for any code cruft.
+   Should also run for less than a few minutes.
+
 
-2. ``setup_environment.sh``: Configure root's ``.bash_profile``
-   for all subsequent scripts (each run in a new shell).  Any
-   distribution-specific environment variables are also defined
-   here.  For example, setting tags/flags to use compiling.
+### ``testing`` Task
 
-3. ``verify_source.sh``: Perform per-distribution source
-   verification, lint-checking, etc.  This acts as a minimal
-   gate, blocking extended use of VMs when a PR's code or commits
-   would otherwise not be accepted.  Should run for less than a minute.
+***N/B: Steps below are performed by automation***
 
-4. ``unit_test.sh``: Execute unit-testing, as defined by the ``Makefile``.
-   This should execute within 10-minutes, but often much faster.
+1. After `gating` passes, spin up one VM per
+   `matrix: image_name` item. Once accessible, ``ssh``
+   into each VM as the `root` user.
+
+2. ``setup_environment.sh``: Configure root's `.bash_profile`
+    for all subsequent scripts (each run in a new shell).  Any
+    distribution-specific environment variables are also defined
+    here.  For example, setting tags/flags to use compiling.
 
 5. ``integration_test.sh``: Execute integration-testing.  This is
    much more involved, and relies on access to external
@@ -37,9 +48,12 @@ task (pass or fail) is set based on the exit status of the last script to execut
    Total execution time is capped at 2-hours (includes all the above)
    but this script normally completes in less than an hour.
 
-### ``optional_system_testing`` Task
 
-1. Optionally executes in parallel with ``full_vm_testing``.  Requires
+### ``optional_testing`` Task
+
+***N/B: Steps below are performed by automation***
+
+1. Optionally executes in parallel with ``testing``.  Requires
     **prior** to job-start, the magic string ``***CIRRUS: SYSTEM TEST***``
    is found in the pull-request *description*.  The *description* is the first
    text-box under the main *summary* line in the github WebUI.
@@ -49,16 +63,17 @@ task (pass or fail) is set based on the exit status of the last script to execut
 3. ``system_test.sh``: Build both dependencies and libpod, install them,
    then execute `make localsystem` from the repository root.
 
-### ``build_vm_images`` Task
 
-1. When a PR is merged (``$CIRRUS_BRANCH`` == ``master``), Cirrus
-   checks the last commit message. If it contains the magic string
-   ``***CIRRUS: REBUILD IMAGES***``, then this task continues.
+### ``cache_images`` Task
 
-2. Execute run another round of the ``full_vm_testing`` task (above).
-   After the tests pass (post-merge), spin up a special VM
-   (from the `image-builder-image`) capable of communicating with the
-   GCE API.  Once accessible, ``ssh`` into the VM and run the following scripts.
+***N/B: Steps below are performed by automation***
+
+1. When a PR is merged (``$CIRRUS_BRANCH`` == ``master``), run another
+   round of the ``gating`` and ``testing`` tasks (above).
+
+2. Assuming tests pass, if the commit message contains the magic string
+   ``***CIRRUS: REBUILD IMAGES***``, then this task continues.  Otherwise
+   simply mark the master branch as 'passed'.
 
 3. ``setup_environment.sh``: Same as for other tasks.
 
@@ -70,13 +85,108 @@ task (pass or fail) is set based on the exit status of the last script to execut
     1. On a base-image VM, as root, copy the current state of the repository
        into ``/tmp/libpod``.
     2. Execute distribution-specific scripts to prepare the image for
-       use by the ``full_vm_testing`` task (above).  These scripts all
-       end with the suffix `_setup.sh` within the `$PACKER_BASE` directory.
+       use by the ``integration_testing`` task (above).  For example,
+       ``fedora_setup.sh``.
     3. If successful, shut down each VM and create a new GCE Image
-       named after the base image and the commit sha of the merge.
+       named with the base image, and the commit sha of the merge.
 
 ***Note:*** The ``.cirrus.yml`` file must be manually updated with the new
 images names, then the change sent in via a secondary pull-request.  This
-ensures that all the ``full_vm_testing`` tasks can pass with the new images,
+ensures that all the ``integration_testing`` tasks can pass with the new images,
 before subjecting all future PRs to them.  A workflow to automate this
 process is described in comments at the end of the ``.cirrus.yml`` file.
+
+### Base-images
+
+Base-images are VM disk-images specially prepared for executing as GCE VMs.
+In particular, they run services on startup similar in purpose/function
+as the standard 'cloud-init' services.
+
+*  The google services are required for full support of ssh-key management
+   and GCE OAuth capabilities.  Google provides native images in GCE
+   with services pre-installed, for many platforms. For example,
+   RHEL, CentOS, and Ubuntu.
+
+*  Google does ***not*** provide any images for Fedora or Fedora Atomic
+   Host (as of 11/2018), nor do they provide a base-image prepared to
+   run packer for creating other images in the ``build_vm_images`` Task
+   (above).
+
+*  Base images do not need to be produced often, but doing so completely
+   manually would be time-consuming and error-prone.  Therefor a special
+   semi-automatic *Makefile* target is provided to assist with producing
+   all the base-images: ``libpod_base_images``
+
+To produce new base-images, including an `image-builder-image` (used by
+the ``cache_images`` Task) some input parameters are required:
+
+    *  ``GCP_PROJECT_ID``: The complete GCP project ID string e.g. foobar-12345
+       identifying where the images will be stored.
+
+    *  ``GOOGLE_APPLICATION_CREDENTIALS``: A *JSON* file containing
+       credentials for a GCE service account.  This can be [a service
+       account](https://cloud.google.com/docs/authentication/production#obtaining_and_providing_service_account_credentials_manually)
+       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``.
+
+The following process should be performed on a bare-metal CentOS 7 machine
+with network access to GCE.  Software dependencies can be obtained from
+the ``packer/image-builder-image_base_setup.sh`` script.
+
+Alternatively, an existing image-builder-image may be used from within GCE.
+However it must be created with elevated cloud privileges.  For example,
+
+```
+$ alias pgcloud='sudo podman run -it --rm -e AS_ID=$UID
+    -e AS_USER=$USER -v /home/$USER:/home/$USER:z cevich/gcloud_centos:latest'
+
+$ URL=https://www.googleapis.com/auth
+$ SCOPES=$URL/userinfo.email,$URL/compute,$URL/devstorage.full_control
+
+$ pgcloud compute instances create $USER-making-images \
+    --image-family image-builder-image \
+    --boot-disk-size "200GB" \
+    --min-cpu-platform "Intel Haswell" \
+    --machine-type n1-standard-2 \
+    --scopes $SCOPES
+
+$ pgcloud compute ssh centos@$USER-making-images
+...
+```
+
+When ready, change to the ``packer`` sub-directory, and run:
+
+```
+$ make libpod_base_images GCP_PROJECT_ID=<VALUE> \
+    GOOGLE_APPLICATION_CREDENTIALS=<VALUE> \
+    RHEL_IMAGE_FILE=<VALUE> \
+    RHEL_CSUM_FILE=<VALUE> \
+    PACKER_BUILDS=<OPTIONAL>
+```
+
+Assuming this is successful (hence the semi-automatic part), packer will
+produce a ``packer-manifest.json`` output file.  This contains the base-image
+names suitable for updating in ``.cirrus.yml``, `env` keys ``*_BASE_IMAGE``.
+
+On failure, it should be possible to determine the problem from the packer
+output.  The only exception is for the Fedora and FAH builds, which utilize
+local qemu-kvm virtualisation.  To observe the serial-port output from those
+builds, set the ``TTYDEV`` parameter to your current device.  For example:
+
+```
+$ make libpod_base_images ... TTYDEV=$(tty)
+  ...
+```