Merge pull request #1660 from cevich/cirrus_criu

Cirrus: Install CRIU in test images

5 files changed, 124 insertions, 69 deletions

diff --git a/contrib/cirrus/packer/centos_setup.sh b/contrib/cirrus/packer/centos_setup.sh
index 2253d7b35..7b2308739 100644
--- a/contrib/cirrus/packer/centos_setup.sh
+++ b/contrib/cirrus/packer/centos_setup.sh
@@ -12,6 +12,7 @@ req_env_var "
 SCRIPT_BASE $SCRIPT_BASE
 CNI_COMMIT $CNI_COMMIT
 CRIO_COMMIT $CRIO_COMMIT
+CRIU_COMMIT $CRIU_COMMIT
 "
 
 install_ooe
@@ -24,35 +25,46 @@ ooe.sh sudo yum -y update
 ooe.sh sudo yum -y install centos-release-scl epel-release
 
 ooe.sh sudo yum -y install \
-          atomic-registries \
-          btrfs-progs-devel \
-          bzip2 \
-          device-mapper-devel \
-          findutils \
-          glib2-devel \
-          glibc-static \
-          gnupg \
-          golang \
-          golang-github-cpuguy83-go-md2man \
-          golang-github-cpuguy83-go-md2man \
-          gpgme-devel \
-          iptables \
-          libassuan-devel \
-          libseccomp-devel \
-          libselinux-devel \
-          lsof \
-          make \
-          nmap-ncat \
-          ostree-devel \
-          python \
-          python3-dateutil \
-          python3-psutil \
-          python3-pytoml \
-          runc \
-          skopeo-containers \
-          unzip \
-          which \
-          xz
+    atomic-registries \
+    btrfs-progs-devel \
+    bzip2 \
+    device-mapper-devel \
+    findutils \
+    glib2-devel \
+    glibc-static \
+    gnupg \
+    golang \
+    golang-github-cpuguy83-go-md2man \
+    golang-github-cpuguy83-go-md2man \
+    gpgme-devel \
+    iptables \
+    libassuan-devel \
+    libcap-devel \
+    libnet \
+    libnet-devel \
+    libnl3-devel \
+    libseccomp-devel \
+    libselinux-devel \
+    lsof \
+    make \
+    nmap-ncat \
+    ostree-devel \
+    protobuf \
+    protobuf-c \
+    protobuf-c-devel \
+    protobuf-compiler \
+    protobuf-devel \
+    protobuf-python \
+    python \
+    python2-future \
+    python3-dateutil \
+    python3-psutil \
+    python3-pytoml \
+    runc \
+    skopeo-containers \
+    unzip \
+    which \
+    xz
 
 install_scl_git
 
@@ -62,6 +74,8 @@ install_buildah
 
 install_conmon
 
+install_criu
+
 install_packer_copied_files
 
 rh_finalize
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 53709fbdd..16b6e4e6b 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -12,6 +12,7 @@ req_env_var "
 SCRIPT_BASE $SCRIPT_BASE
 CNI_COMMIT $CNI_COMMIT
 CRIO_COMMIT $CRIO_COMMIT
+CRIU_COMMIT $CRIU_COMMIT
 RUNC_COMMIT $RUNC_COMMIT
 "
 
@@ -40,6 +41,10 @@ ooe.sh sudo dnf install -y \
     gpgme-devel \
     iptables \
     libassuan-devel \
+    libcap-devel \
+    libnet \
+    libnet-devel \
+    libnl3-devel \
     libseccomp-devel \
     libselinux-devel \
     lsof \
@@ -47,14 +52,21 @@ ooe.sh sudo dnf install -y \
     nmap-ncat \
     ostree-devel \
     procps-ng \
+    protobuf \
+    protobuf-c \
+    protobuf-c-devel \
+    protobuf-compiler \
+    protobuf-devel \
+    protobuf-python \
     python \
+    python2-future \
     python3-dateutil \
     python3-psutil \
     python3-pytoml \
     runc \
     skopeo-containers \
     slirp4netns \
-    which\
+    which \
     xz
 
 install_varlink
@@ -65,6 +77,8 @@ install_buildah
 
 install_conmon
 
+install_criu
+
 install_packer_copied_files
 
 rh_finalize # N/B: Halts system!
diff --git a/contrib/cirrus/packer/libpod_images.json b/contrib/cirrus/packer/libpod_images.json
index 82a41ca25..9dac3e8ea 100644
--- a/contrib/cirrus/packer/libpod_images.json
+++ b/contrib/cirrus/packer/libpod_images.json
@@ -1,7 +1,9 @@
 {
   "variables": {
+    "FEDORA_CNI_COMMIT": "{{env `FEDORA_CNI_COMMIT`}}",
     "CNI_COMMIT": "{{env `CNI_COMMIT`}}",
     "CRIO_COMMIT": "{{env `CRIO_COMMIT`}}",
+    "CRIU_COMMIT": "{{env `CRIU_COMMIT`}}",
     "RUNC_COMMIT": "{{env `RUNC_COMMIT`}}",
 
     "CENTOS_BASE_IMAGE": "{{env `CENTOS_BASE_IMAGE`}}" ,
@@ -15,7 +17,7 @@
 
     "SERVICE_ACCOUNT": "{{env `SERVICE_ACCOUNT`}}",
     "GCP_PROJECT_ID": "{{env `GCP_PROJECT_ID`}}",
-    "CIRRUS_BUILD_ID": "{{env `CIRRUS_BUILD_ID`}}",
+    "BUILT_IMAGE_SUFFIX": "{{env `BUILT_IMAGE_SUFFIX`}}",
     "GCE_SSH_USERNAME": "{{env `GCE_SSH_USERNAME`}}",
     "RHSM_COMMAND": "{{env `RHSM_COMMAND`}}"
   },
@@ -29,7 +31,7 @@
       "project_id": "{{user `GCP_PROJECT_ID`}}",
       "zone": "us-central1-a",
       "source_image": "{{user `RHEL_BASE_IMAGE`}}",
-      "image_name": "{{user `RHEL_BASE_IMAGE`}}-libpod-{{user `CIRRUS_BUILD_ID`}}",
+      "image_name": "{{user `RHEL_BASE_IMAGE`}}{{user `BUILT_IMAGE_SUFFIX`}}",
       "image_family": "{{user `RHEL_BASE_IMAGE`}}-libpod",
       "service_account_email": "{{user `SERVICE_ACCOUNT`}}",
       "communicator": "ssh",
@@ -41,7 +43,7 @@
       "project_id": "{{user `GCP_PROJECT_ID`}}",
       "zone": "us-central1-a",
       "source_image": "{{user `CENTOS_BASE_IMAGE`}}",
-      "image_name": "{{user `CENTOS_BASE_IMAGE`}}-libpod-{{user `CIRRUS_BUILD_ID`}}",
+      "image_name": "{{user `CENTOS_BASE_IMAGE`}}{{user `BUILT_IMAGE_SUFFIX`}}",
       "image_family": "{{user `CENTOS_BASE_IMAGE`}}-libpod",
       "service_account_email": "{{user `SERVICE_ACCOUNT`}}",
       "communicator": "ssh",
@@ -53,7 +55,7 @@
       "project_id": "{{user `GCP_PROJECT_ID`}}",
       "zone": "us-central1-a",
       "source_image": "{{user `FEDORA_BASE_IMAGE`}}",
-      "image_name": "{{user `FEDORA_BASE_IMAGE`}}-libpod-{{user `CIRRUS_BUILD_ID`}}",
+      "image_name": "{{user `FEDORA_BASE_IMAGE`}}{{user `BUILT_IMAGE_SUFFIX`}}",
       "image_family": "{{user `FEDORA_BASE_IMAGE`}}-libpod",
       "service_account_email": "{{user `SERVICE_ACCOUNT`}}",
       "communicator": "ssh",
@@ -65,7 +67,7 @@
       "project_id": "{{user `GCP_PROJECT_ID`}}",
       "zone": "us-central1-a",
       "source_image": "{{user `UBUNTU_BASE_IMAGE`}}",
-      "image_name": "{{user `UBUNTU_BASE_IMAGE`}}-libpod-{{user `CIRRUS_BUILD_ID`}}",
+      "image_name": "{{user `UBUNTU_BASE_IMAGE`}}{{user `BUILT_IMAGE_SUFFIX`}}",
       "image_family": "{{user `UBUNTU_BASE_IMAGE`}}-libpod",
       "service_account_email": "{{user `SERVICE_ACCOUNT`}}",
       "communicator": "ssh",
@@ -86,6 +88,7 @@
         "SCRIPT_BASE={{user `SCRIPT_BASE`}}",
         "CNI_COMMIT={{user `CNI_COMMIT`}}",
         "CRIO_COMMIT={{user `CRIO_COMMIT`}}",
+        "CRIU_COMMIT={{user `CRIU_COMMIT`}}",
         "RUNC_COMMIT={{user `RUNC_COMMIT`}}",
         "RHSM_COMMAND={{user `RHSM_COMMAND`}}"
       ]
@@ -97,6 +100,7 @@
         "SCRIPT_BASE={{user `SCRIPT_BASE`}}",
         "CNI_COMMIT={{user `CNI_COMMIT`}}",
         "CRIO_COMMIT={{user `CRIO_COMMIT`}}",
+        "CRIU_COMMIT={{user `CRIU_COMMIT`}}",
         "RUNC_COMMIT={{user `RUNC_COMMIT`}}"
       ]
     },{
@@ -105,8 +109,9 @@
       "script": "{{user `GOSRC`}}/{{user `PACKER_BASE`}}/fedora_setup.sh",
       "environment_vars": [
         "SCRIPT_BASE={{user `SCRIPT_BASE`}}",
-        "CNI_COMMIT={{user `CNI_COMMIT`}}",
+        "CNI_COMMIT={{user `FEDORA_CNI_COMMIT`}}",
         "CRIO_COMMIT={{user `CRIO_COMMIT`}}",
+        "CRIU_COMMIT={{user `CRIU_COMMIT`}}",
         "RUNC_COMMIT={{user `RUNC_COMMIT`}}"
       ]
     },{
@@ -117,6 +122,7 @@
         "SCRIPT_BASE={{user `SCRIPT_BASE`}}",
         "CNI_COMMIT={{user `CNI_COMMIT`}}",
         "CRIO_COMMIT={{user `CRIO_COMMIT`}}",
+        "CRIU_COMMIT={{user `CRIU_COMMIT`}}",
         "RUNC_COMMIT={{user `RUNC_COMMIT`}}"
       ]
     }
diff --git a/contrib/cirrus/packer/rhel_setup.sh b/contrib/cirrus/packer/rhel_setup.sh
index b776a0d97..d296713fc 100644
--- a/contrib/cirrus/packer/rhel_setup.sh
+++ b/contrib/cirrus/packer/rhel_setup.sh
@@ -12,6 +12,7 @@ req_env_var "
 SCRIPT_BASE $SCRIPT_BASE
 CNI_COMMIT $CNI_COMMIT
 CRIO_COMMIT $CRIO_COMMIT
+CRIU_COMMIT $CRIU_COMMIT
 RHSM_COMMAND $RHSM_COMMAND
 "
 
@@ -62,37 +63,48 @@ gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
 EOM
 
 ooe.sh sudo yum -y install \
-          atomic-registries \
-          btrfs-progs-devel \
-          bzip2 \
-          device-mapper-devel \
-          findutils \
-          glib2-devel \
-          glibc-static \
-          gnupg \
-          golang \
-          golang-github-cpuguy83-go-md2man \
-          golang-github-cpuguy83-go-md2man \
-          google-compute-engine \
-          google-compute-engine-oslogin \
-          gpgme-devel \
-          iptables \
-          libassuan-devel \
-          libseccomp-devel \
-          libselinux-devel \
-          lsof \
-          make \
-          nmap-ncat \
-          ostree-devel \
-          python \
-          python34-dateutil \
-          python34-psutil \
-          python34-pytoml \
-          runc \
-          skopeo-containers \
-          unzip \
-          which \
-          xz
+    atomic-registries \
+    btrfs-progs-devel \
+    bzip2 \
+    device-mapper-devel \
+    findutils \
+    glib2-devel \
+    glibc-static \
+    gnupg \
+    golang \
+    golang-github-cpuguy83-go-md2man \
+    golang-github-cpuguy83-go-md2man \
+    google-compute-engine \
+    google-compute-engine-oslogin \
+    gpgme-devel \
+    iptables \
+    libassuan-devel \
+    libcap-devel \
+    libnet \
+    libnet-devel \
+    libnl3-devel \
+    libseccomp-devel \
+    libselinux-devel \
+    lsof \
+    make \
+    nmap-ncat \
+    ostree-devel \
+    protobuf \
+    protobuf-c \
+    protobuf-c-devel \
+    protobuf-compiler \
+    protobuf-devel \
+    protobuf-python \
+    python \
+    python2-future \
+    python34-dateutil \
+    python34-psutil \
+    python34-pytoml \
+    runc \
+    skopeo-containers \
+    unzip \
+    which \
+    xz
 
 install_scl_git
 
@@ -102,6 +114,8 @@ install_buildah
 
 install_conmon
 
+install_criu
+
 install_packer_copied_files
 
 exit_handler  # release subscription!
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 96b3a573f..ff20944dc 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -12,6 +12,7 @@ req_env_var "
 SCRIPT_BASE $SCRIPT_BASE
 CNI_COMMIT $CNI_COMMIT
 CRIO_COMMIT $CRIO_COMMIT
+CRIU_COMMIT $CRIU_COMMIT
 RUNC_COMMIT $RUNC_COMMIT
 "
 
@@ -34,8 +35,8 @@ ooe.sh sudo apt-get -qq install --no-install-recommends \
     e2fslibs-dev \
     gawk \
     gettext \
-    golang \
     go-md2man \
+    golang \
     iptables \
     libaio-dev \
     libapparmor-dev \
@@ -46,18 +47,22 @@ ooe.sh sudo apt-get -qq install --no-install-recommends \
     libglib2.0-dev \
     libgpgme11-dev \
     liblzma-dev \
+    libnet1 \
+    libnet1-dev \
+    libnl-3-dev \
     libostree-dev \
     libprotobuf-c0-dev \
     libprotobuf-dev \
     libtool \
-    libtool \
     libudev-dev \
     lsof \
     netcat \
     pkg-config \
     protobuf-c-compiler \
     protobuf-compiler \
+    python-future \
     python-minimal \
+    python-protobuf \
     python3-dateutil \
     python3-pip \
     python3-psutil \
@@ -77,6 +82,8 @@ install_runc
 
 install_conmon
 
+install_criu
+
 install_cni_plugins
 
 install_buildah