From 7d78ed71916338f21dcee22065d297039afb81e9 Mon Sep 17 00:00:00 2001 From: Daniel Alley Date: Mon, 7 Dec 2020 14:44:08 -0500 Subject: [PATCH] Fix Required PR: for pulp-smash [noissue] --- .../workflows/scripts/before_install.sh.j2 | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/templates/github/.github/workflows/scripts/before_install.sh.j2 b/templates/github/.github/workflows/scripts/before_install.sh.j2 index 761ffca3..a22c51b7 100755 --- a/templates/github/.github/workflows/scripts/before_install.sh.j2 +++ b/templates/github/.github/workflows/scripts/before_install.sh.j2 @@ -87,23 +87,16 @@ cd .. {% endif %} {% if plugin_name != 'pulpcore' %} -# When building a (release) tag, we don't need the development modules for the -# build (they will be installed as dependencies of the plugin). -if [ "${TAG_BUILD}" = "1" ]; then -{% endif %} - git clone --depth=1 https://github.com/pulp/pulp-smash.git - - if [ -n "$PULP_SMASH_PR_NUMBER" ]; then - cd pulp-smash - git fetch --depth=1 origin pull/$PULP_SMASH_PR_NUMBER/head:$PULP_SMASH_PR_NUMBER - git checkout $PULP_SMASH_PR_NUMBER - cd .. - fi +git clone --depth=1 https://github.com/pulp/pulp-smash.git - # pulp-smash already got installed via test_requirements.txt - pip install --upgrade --force-reinstall ./pulp-smash -{% if plugin_name != 'pulpcore' %} +if [ -n "$PULP_SMASH_PR_NUMBER" ]; then + cd pulp-smash + git fetch --depth=1 origin pull/$PULP_SMASH_PR_NUMBER/head:$PULP_SMASH_PR_NUMBER + git checkout $PULP_SMASH_PR_NUMBER + cd .. fi + +pip install --upgrade --force-reinstall ./pulp-smash {% endif %} {%- for plugin in additional_plugins %}