diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-11-21 14:31:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-21 14:31:19 -0500 |
commit | 8d12df4b390832664f0be2d9955440bdeb00bb29 (patch) | |
tree | 8e314a54b112ec935e753ddef2bd939a473fffb2 | |
parent | ffff1d7465d92e7f5522da11d6fd1ae23c54fdfb (diff) | |
parent | fe087c0c4eeadf583f35b3d978ced9f350bdde8a (diff) | |
download | openshift-8d12df4b390832664f0be2d9955440bdeb00bb29.tar.gz openshift-8d12df4b390832664f0be2d9955440bdeb00bb29.tar.bz2 openshift-8d12df4b390832664f0be2d9955440bdeb00bb29.tar.xz openshift-8d12df4b390832664f0be2d9955440bdeb00bb29.zip |
Merge pull request #6209 from jlebon/pr/use-env-var
papr: use new PAPR_PULL_TARGET_BRANCH
-rwxr-xr-x | .papr.sh | 20 |
1 files changed, 1 insertions, 19 deletions
@@ -1,22 +1,6 @@ #!/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. @@ -24,9 +8,7 @@ print(j)" "$@" 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" ] + target_branch=$PAPR_PULL_TARGET_BRANCH fi # this is a bit wasteful, though there's no easy way to say "only clone up to |