summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-27 12:07:52 -0400
committerGitHub <noreply@github.com>2017-09-27 12:07:52 -0400
commit56227145bc90ded66b76894373bb59ebab90efc8 (patch)
tree7f50ac6f2d21e73f4a3f0737830e982dcc24b364
parentcc161d1b79f53b7daa4837f9fc262455cf04a4f4 (diff)
parent67a35983887e20764210e745d1e672991d4ea556 (diff)
downloadopenshift-56227145bc90ded66b76894373bb59ebab90efc8.tar.gz
openshift-56227145bc90ded66b76894373bb59ebab90efc8.tar.bz2
openshift-56227145bc90ded66b76894373bb59ebab90efc8.tar.xz
openshift-56227145bc90ded66b76894373bb59ebab90efc8.zip
Merge pull request #5461 from ashcrow/papr-bump
papr: Update to later versions
-rw-r--r--.papr.yml31
1 files changed, 19 insertions, 12 deletions
diff --git a/.papr.yml b/.papr.yml
index 6658720e4..119dd5fcf 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -14,28 +14,35 @@
cluster:
hosts:
- name: ocp-master
- distro: fedora/25/atomic
+ distro: fedora/26/atomic
+ specs:
+ ram: 4096
- name: ocp-node1
- distro: fedora/25/atomic
+ distro: fedora/26/atomic
- name: ocp-node2
- distro: fedora/25/atomic
+ distro: fedora/26/atomic
container:
- image: fedora:25
+ image: registry.fedoraproject.org/fedora:26
-packages:
- - gcc
- - python-pip
- - python-devel
- - libffi-devel
- - openssl-devel
- - redhat-rpm-config
+# temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1483553
+#packages:
+# - gcc
+# - python-pip
+# - python-devel
+# - libffi-devel
+# - openssl-devel
+# - redhat-rpm-config
-context: 'fedora/25/atomic'
+context: 'fedora/26/atomic'
env:
OPENSHIFT_IMAGE_TAG: v3.6.0
tests:
+ # temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1483553
+ - if (dnf distro-sync -y || :) |& grep -q -e BDB1539; then
+ rpm --rebuilddb; dnf distro-sync;
+ fi; dnf install -y gcc python-pip python-devel libffi-devel openssl-devel redhat-rpm-config
- ./.papr.sh
artifacts: