Merge pull request #6132 from jlebon/pr/bump-and-fix

papr: auto-detect image tag to use and bump to f27

.papr.sh

@@ -1,6 +1,39 @@
 #!/bin/bash
 set -xeuo pipefail
 
+pip install requests
+
+query_github() {
+    repo=$1; shift
+    resource=$1; shift
+    python -c "
+import sys
+import requests
+j = requests.get('https://api.github.com/repos/$repo/$resource').json()
+for q in sys.argv[1:]:
+    if q.isdigit():
+        q = int(q)
+    j = j[q]
+print(j)" "$@"
+}
+
+# Essentially use a similar procedure other openshift-ansible PR tests use to
+# determine which image tag should be used. This allows us to avoid hardcoding a
+# specific version which quickly becomes stale.
+
+if [ -n "${PAPR_BRANCH:-}" ]; then
+    target_branch=$PAPR_BRANCH
+else
+    # check which branch we're targeting if we're a PR
+    target_branch=$(query_github $PAPR_REPO pulls/$PAPR_PULL_ID base ref)
+    [ -n "$target_branch" ]
+fi
+
+# this is a bit wasteful, though there's no easy way to say "only clone up to
+# the first tag in the branch" -- ideally, PAPR could help with caching here
+git clone --branch $target_branch --single-branch https://github.com/openshift/origin
+export OPENSHIFT_IMAGE_TAG=$(git -C origin describe --abbrev=0)
+
 echo "Targeting OpenShift Origin $OPENSHIFT_IMAGE_TAG"
 
 pip install -r requirements.txt
@@ -22,12 +55,15 @@ trap upload_journals ERR
 # https://github.com/openshift/openshift-ansible/issues/4478 is fixed.
 ansible-playbook -vvv -i .papr.inventory playbooks/byo/config.yml -e "openshift_image_tag=$OPENSHIFT_IMAGE_TAG"
 
-# run a small subset of origin conformance tests to sanity
-# check the cluster NB: we run it on the master since we may
-# be in a different OSP network
-ssh ocp-master docker run --rm --net=host --privileged \
-  -v /etc/origin/master/admin.kubeconfig:/config \
-  registry.fedoraproject.org/fedora:26 sh -c \
-    '"dnf install -y origin-tests && \
-      KUBECONFIG=/config /usr/libexec/origin/extended.test --ginkgo.v=1 \
-        --ginkgo.noColor --ginkgo.focus=\"Services.*NodePort|EmptyDir\""'
+### DISABLING TESTS FOR NOW, SEE:
+### https://github.com/openshift/openshift-ansible/pull/6132
+
+### # run a small subset of origin conformance tests to sanity
+### # check the cluster NB: we run it on the master since we may
+### # be in a different OSP network
+### ssh ocp-master docker run --rm --net=host --privileged \
+###   -v /etc/origin/master/admin.kubeconfig:/config \
+###   registry.fedoraproject.org/fedora:27 sh -c \
+###     '"dnf install -y origin-tests && \
+###       KUBECONFIG=/config /usr/libexec/origin/extended.test --ginkgo.v=1 \
+###         --ginkgo.noColor --ginkgo.focus=\"Services.*NodePort|EmptyDir\""'

.papr.yml

@@ -14,35 +14,28 @@
 cluster:
   hosts:
     - name: ocp-master
-      distro: fedora/26/atomic
+      distro: fedora/27/atomic
       specs:
         ram: 4096
     - name: ocp-node1
-      distro: fedora/26/atomic
+      distro: fedora/27/atomic
     - name: ocp-node2
-      distro: fedora/26/atomic
+      distro: fedora/27/atomic
   container:
-    image: registry.fedoraproject.org/fedora:26
+    image: registry.fedoraproject.org/fedora:27
 
-# 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
+packages:
+  - gcc
+  - git
+  - python-pip
+  - python-devel
+  - libffi-devel
+  - openssl-devel
+  - redhat-rpm-config
 
-context: 'fedora/26/atomic'
-
-env:
-  OPENSHIFT_IMAGE_TAG: v3.6.0
+context: 'fedora/27/atomic'
 
 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: