Skip to content

Commit

Permalink
Update refs to pulpqe repos
Browse files Browse the repository at this point in the history
ref #5867

(cherry picked from commit 15c8ca8)
  • Loading branch information
David Davis authored and Travis CI User committed Jan 13, 2020
1 parent fe4ca2f commit 1c2fee1
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fi
if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ -z "$TRAVIS_TAG" -a "$TRAVIS_BRANCH" != "master"]
then
export PULP_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulpcore\/pull\/(\d+)' | awk -F'/' '{print $7}')
export PULP_SMASH_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/PulpQE\/pulp-smash\/pull\/(\d+)' | awk -F'/' '{print $7}')
export PULP_SMASH_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp-smash\/pull\/(\d+)' | awk -F'/' '{print $7}')
export PULP_ROLES_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/ansible-pulp\/pull\/(\d+)' | awk -F'/' '{print $7}')
export PULP_BINDINGS_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp-openapi-generator\/pull\/(\d+)' | awk -F'/' '{print $7}')
export PULP_OPERATOR_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp-operator\/pull\/(\d+)' | awk -F'/' '{print $7}')
Expand Down Expand Up @@ -89,7 +89,7 @@ fi
# build (they will be installed as dependencies of the plugin).
if [ -z "$TRAVIS_TAG" ]; then

git clone --depth=1 https://github.com/PulpQE/pulp-smash.git
git clone --depth=1 https://github.com/pulp/pulp-smash.git

if [ -n "$PULP_SMASH_PR_NUMBER" ]; then
cd pulp-smash
Expand Down
1 change: 1 addition & 0 deletions CHANGES/5867.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update refs to PulpQE repos
2 changes: 1 addition & 1 deletion functest_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
git+https://github.com/PulpQE/pulp-smash.git#egg=pulp-smash
git+https://github.com/pulp/pulp-smash.git#egg=pulp-smash
2 changes: 1 addition & 1 deletion pulp_rpm/tests/functional/api/test_crud_content_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ContentUnitTestCase(unittest.TestCase):
* `Pulp #2872 <https://pulp.plan.io/issues/2872>`_
* `Pulp #3445 <https://pulp.plan.io/issues/3445>`_
* `Pulp Smash #870 <https://github.com/PulpQE/pulp-smash/issues/870>`_
* `Pulp Smash #870 <https://github.com/pulp/pulp-smash/issues/870>`_
"""

@classmethod
Expand Down
4 changes: 2 additions & 2 deletions pulp_rpm/tests/functional/api/test_crud_remotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_02_create_same_name(self):
"""Try to create a second remote with an identical name.
See: `Pulp Smash #1055
<https://github.com/PulpQE/pulp-smash/issues/1055>`_.
<https://github.com/pulp/pulp-smash/issues/1055>`_.
"""
body = gen_rpm_remote()
body['name'] = self.remote['name']
Expand Down Expand Up @@ -108,7 +108,7 @@ def test_all(self):
This test targets the following issues:
* `Pulp #3395 <https://pulp.plan.io/issues/3395>`_
* `Pulp Smash #984 <https://github.com/PulpQE/pulp-smash/issues/984>`_
* `Pulp Smash #984 <https://github.com/pulp/pulp-smash/issues/984>`_
"""
body = gen_rpm_remote()
del body['url']
Expand Down
2 changes: 1 addition & 1 deletion pulp_rpm/tests/functional/api/test_download_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def test_all(self):
This test targets the following issues:
* `Pulp #2895 <https://pulp.plan.io/issues/2895>`_
* `Pulp Smash #872 <https://github.com/PulpQE/pulp-smash/issues/872>`_
* `Pulp Smash #872 <https://github.com/pulp/pulp-smash/issues/872>`_
"""
cfg = config.get_config()
client = api.Client(cfg, api.json_handler)
Expand Down
2 changes: 1 addition & 1 deletion pulp_rpm/tests/functional/api/test_publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class PublishAnyRepoVersionTestCase(unittest.TestCase):
This test targets the following issues:
* `Pulp #3324 <https://pulp.plan.io/issues/3324>`_
* `Pulp Smash #897 <https://github.com/PulpQE/pulp-smash/issues/897>`_
* `Pulp Smash #897 <https://github.com/pulp/pulp-smash/issues/897>`_
"""

@classmethod
Expand Down

0 comments on commit 1c2fee1

Please sign in to comment.