opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1998 from adrianreber/with-criu-again

Browse Source 
Use existing CRIU packages for testing instead of building from git
This commit is contained in:
OpenShift Merge Robot
2018-12-21 05:40:30 -08:00
committed by GitHub
parent fa998f224f 38e3fb53f6
commit 28e30408b6
1 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/cirrus/lib.sh
View File

@ -248,10 +248,37 @@ install_conmon(){
} }
install_criu(){ install_criu(){
OS_RELEASE_ID=$(os_release_id)
OS_RELEASE_VER=$(os_release_ver)
echo "Installing CRIU"
echo "Installing CRIU from commit $CRIU_COMMIT" echo "Installing CRIU from commit $CRIU_COMMIT"
echo "Platform is $OS_RELEASE_ID"
req_env_var " req_env_var "
CRIU_COMMIT $CRIU_COMMIT CRIU_COMMIT $CRIU_COMMIT
" "
if [[ "$OS_RELEASE_ID" =~ "ubuntu" ]]; then
ooe.sh sudo add-apt-repository ppa:criu/ppa
ooe.sh sudo apt-get update
ooe.sh sudo apt-get -y install criu
elif [[ ( "$OS_RELEASE_ID" =~ "centos" || "$OS_RELEASE_ID" =~ "rhel" ) && "$OS_RELEASE_VER" =~ "7"* ]]; then
echo "Configuring Repositories for latest CRIU"
ooe.sh sudo tee /etc/yum.repos.d/adrian-criu-el7.repo <<EOF
[adrian-criu-el7]
name=Copr repo for criu-el7 owned by adrian
baseurl=https://copr-be.cloud.fedoraproject.org/results/adrian/criu-el7/epel-7-$basearch/
type=rpm-md
skip_if_unavailable=True
gpgcheck=1
gpgkey=https://copr-be.cloud.fedoraproject.org/results/adrian/criu-el7/pubkey.gpg
repo_gpgcheck=0
enabled=1
enabled_metadata=1
EOF
ooe.sh sudo yum -y install criu
elif [[ "$OS_RELEASE_ID" =~ "fedora" ]]; then
echo "Using CRIU from distribution"
else
DEST="/tmp/criu" DEST="/tmp/criu"
rm -rf "$DEST" rm -rf "$DEST"
ooe.sh git clone https://github.com/checkpoint-restore/criu.git "$DEST" ooe.sh git clone https://github.com/checkpoint-restore/criu.git "$DEST"
@ -260,6 +287,7 @@ install_criu(){
ooe.sh git checkout -q "$CRIU_COMMIT" ooe.sh git checkout -q "$CRIU_COMMIT"
ooe.sh make ooe.sh make
sudo install -D -m 755 criu/criu /usr/sbin/ sudo install -D -m 755 criu/criu /usr/sbin/
fi
} }
# Runs in testing VM, not image building # Runs in testing VM, not image building