opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1624 from cevich/update_fedora

Browse Source 
Cirrus: Enable updating F28 image
This commit is contained in:
OpenShift Merge Robot
2018-11-01 10:23:27 -07:00
committed by GitHub
parent 7772350f52 ed67d302ef
commit 17716d787a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.cirrus.yml
View File

@ -47,6 +47,7 @@ full_vm_testing_task:
#image_name: "rhel-server-ec2-7-5-165-1-libpod-fce09afe" #image_name: "rhel-server-ec2-7-5-165-1-libpod-fce09afe"
#image_name: "centos-7-v20180911-libpod-fce09afe" #image_name: "centos-7-v20180911-libpod-fce09afe"
#image_name: "fedora-cloud-base-28-1-1-7-libpod-fce09afe" #image_name: "fedora-cloud-base-28-1-1-7-libpod-fce09afe"
timeout_in: 120m timeout_in: 120m
# Every *_script runs in sequence, for each task. The name prefix is for # Every *_script runs in sequence, for each task. The name prefix is for

2
contrib/cirrus/lib.sh
View File

@ -279,7 +279,7 @@ install_varlink(){
_finalize(){ _finalize(){
echo "Removing leftover giblets from cloud-init" echo "Removing leftover giblets from cloud-init"
cd / cd /
sudo rm -rf /var/lib/cloud sudo rm -rf /var/lib/cloud/instance?
sudo rm -rf /root/.ssh/* sudo rm -rf /root/.ssh/*
sudo rm -rf /home/* sudo rm -rf /home/*
} }

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

@ -21,8 +21,7 @@ install_ooe
export GOPATH="$(mktemp -d)" export GOPATH="$(mktemp -d)"
trap "sudo rm -rf $GOPATH" EXIT trap "sudo rm -rf $GOPATH" EXIT
# breaks networking on f28/29 in GCE ooe.sh sudo dnf update -y
# ooe.sh sudo dnf update -y
ooe.sh sudo dnf install -y \ ooe.sh sudo dnf install -y \
atomic-registries \ atomic-registries \