diff options
| author | Chris Evich <cevich@redhat.com> | 2018-10-10 14:29:19 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2018-10-31 09:47:43 -0400 |
| commit | ed67d302ef0c838ecb85e87b5b81cae45adefa5b (patch) | |
| tree | ec67f8d86f032a66001f5ceaa2917034734e6c67 | |
| parent | cf4288e3cc1cd95e512cae063066ca26917e378e (diff) | |
| download | podman-ed67d302ef0c838ecb85e87b5b81cae45adefa5b.tar.gz podman-ed67d302ef0c838ecb85e87b5b81cae45adefa5b.tar.bz2 podman-ed67d302ef0c838ecb85e87b5b81cae45adefa5b.zip | |
Cirrus: Enable updating F28 image
Previously this was disabled as some package was breaking networking on
GCE after updating + rebooting. This is fixed now, so we should update
packages when building the fedora test VM image.
https://pagure.io/cloud-sig/issue/292
Signed-off-by: Chris Evich <cevich@redhat.com>
| -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 ae660394b..630d7e242 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 1e0052a65..fbde7e5eb 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -263,7 +263,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 \ |