Cirrus: Install CRIU in test images

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2018-10-16 15:53:16 -04:00
parent a18494a345
commit 89b5484ad2
7 changed files with 137 additions and 67 deletions

View File

@ -202,6 +202,21 @@ install_conmon(){
sudo install -D -m 755 bin/conmon /usr/libexec/podman/conmon
}
install_criu(){
echo "Installing CRIU from commit $CRIU_COMMIT"
req_env_var "
CRIU_COMMIT $CRIU_COMMIT
"
DEST="/tmp/criu"
rm -rf "$DEST"
ooe.sh git clone https://github.com/checkpoint-restore/criu.git "$DEST"
cd $DEST
ooe.sh git fetch origin --tags
ooe.sh git checkout -q "$CRIU_COMMIT"
ooe.sh make
sudo install -D -m 755 criu/criu /usr/sbin/
}
# Runs in testing VM, not image building
install_testing_dependencies() {
echo "Installing ginkgo, gomega, and easyjson into \$GOPATH=$GOPATH"

View File

@ -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

View File

@ -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!

View File

@ -3,6 +3,7 @@
"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`}}" ,
@ -87,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`}}"
]
@ -98,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`}}"
]
},{
@ -108,6 +111,7 @@
"SCRIPT_BASE={{user `SCRIPT_BASE`}}",
"CNI_COMMIT={{user `FEDORA_CNI_COMMIT`}}",
"CRIO_COMMIT={{user `CRIO_COMMIT`}}",
"CRIU_COMMIT={{user `CRIU_COMMIT`}}",
"RUNC_COMMIT={{user `RUNC_COMMIT`}}"
]
},{
@ -118,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`}}"
]
}

View File

@ -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!

View File

@ -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