diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-01 10:23:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 10:23:27 -0700 |
| commit | 17716d787aadee778436641371b487441374484e (patch) | |
| tree | 5015015067f033ca1caf5c5364dc0606f6ebb5a8 | |
| parent | 7772350f525bb02316067733587833266382e47a (diff) | |
| parent | ed67d302ef0c838ecb85e87b5b81cae45adefa5b (diff) | |
| download | podman-17716d787aadee778436641371b487441374484e.tar.gz podman-17716d787aadee778436641371b487441374484e.tar.bz2 podman-17716d787aadee778436641371b487441374484e.zip | |
Merge pull request #1624 from cevich/update_fedora
Cirrus: Enable updating F28 image
| -rw-r--r-- | .cirrus.yml | 1 | ||||
| -rw-r--r-- | contrib/cirrus/lib.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1cf21416e..c5d35141e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -47,6 +47,7 @@ full_vm_testing_task: #image_name: "rhel-server-ec2-7-5-165-1-libpod-fce09afe" #image_name: "centos-7-v20180911-libpod-fce09afe" #image_name: "fedora-cloud-base-28-1-1-7-libpod-fce09afe" + timeout_in: 120m # Every *_script runs in sequence, for each task. The name prefix is for diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 12d24042f..2fa91258b 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -279,7 +279,7 @@ install_varlink(){ _finalize(){ echo "Removing leftover giblets from cloud-init" cd / - sudo rm -rf /var/lib/cloud + sudo rm -rf /var/lib/cloud/instance? sudo rm -rf /root/.ssh/* sudo rm -rf /home/* } diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 16b6e4e6b..f9fea04a7 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -21,8 +21,7 @@ install_ooe export GOPATH="$(mktemp -d)" 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 \ atomic-registries \ |