containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2991 from cevich/libsystemd_dev 

Libsystemd dev + newer runc
This commit is contained in:
OpenShift Merge Robot 2019-04-26 09:00:45 -07:00 committed by GitHub
parent 135c8bef22 4072f2738b
commit a85155617f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.cirrus.yml
View File

@ -28,15 +28,15 @@ env:
#### Cache-image names to test with #### Cache-image names to test with
### ###
ACTIVE_CACHE_IMAGE_NAMES: >- ACTIVE_CACHE_IMAGE_NAMES: >-
fedora-28-libpod-6318419153518592 fedora-29-libpod-548c1c05
fedora-29-libpod-6318419153518592 fedora-28-libpod-548c1c05
ubuntu-18-libpod-6318419153518592 ubuntu-18-libpod-548c1c05
rhel-7-libpod-6318419153518592 rhel-7-libpod-548c1c05
image-builder-image-1541772081 image-builder-image-1541772081
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-6318419153518592" FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-548c1c05"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-6318419153518592" PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-548c1c05"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-6318419153518592" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-548c1c05"
PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-6318419153518592" PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-548c1c05"
# RHEL_CACHE_IMAGE_NAME: "rhel-8-notready" # RHEL_CACHE_IMAGE_NAME: "rhel-8-notready"
# CENTOS_CACHE_IMAGE_NAME: "centos-7-notready" # CENTOS_CACHE_IMAGE_NAME: "centos-7-notready"
@ -49,7 +49,7 @@ env:
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
CRIO_COMMIT: "7a283c391abb7bd25086a8ff91dbb36ebdd24466" CRIO_COMMIT: "7a283c391abb7bd25086a8ff91dbb36ebdd24466"
CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a" CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a"
RUNC_COMMIT: "25f3f893c86d07426df93b7aa172f33fdf093fbd" RUNC_COMMIT: "029124da7af7360afa781a0234d1b083550f797c"
# CSV of cache-image names to build (see $PACKER_BASE/libpod_images.json) # CSV of cache-image names to build (see $PACKER_BASE/libpod_images.json)
PACKER_BUILDS: "ubuntu-18,fedora-29,fedora-28,rhel-7" # TODO: rhel-8,centos-7 PACKER_BUILDS: "ubuntu-18,fedora-29,fedora-28,rhel-7" # TODO: rhel-8,centos-7
# Version of packer to use # Version of packer to use

2
Dockerfile
View File

@ -44,7 +44,7 @@ RUN apt-get update && apt-get install -y \
&& apt-get clean && apt-get clean
# Install runc # Install runc
ENV RUNC_COMMIT 96ec2177ae841256168fcf76954f7177af9446eb ENV RUNC_COMMIT 029124da7af7360afa781a0234d1b083550f797c
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \

3
contrib/cirrus/packer/ubuntu_setup.sh
View File

@ -49,7 +49,7 @@ ooe.sh sudo -E apt-get -qq install \
gettext \ gettext \
go-md2man \ go-md2man \
golang \ golang \
iproute \ iproute2 \
iptables \ iptables \
libaio-dev \ libaio-dev \
libapparmor-dev \ libapparmor-dev \
@ -68,6 +68,7 @@ ooe.sh sudo -E apt-get -qq install \
libprotobuf-dev \ libprotobuf-dev \
libseccomp-dev \ libseccomp-dev \
libseccomp2 \ libseccomp2 \
libsystemd-dev \
libtool \ libtool \
libudev-dev \ libudev-dev \
lsof \ lsof \