Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add content origin #308

Merged
merged 2 commits into from
Nov 8, 2019
Merged

Add content origin #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2349fc1
Set CONTENT_ORIGIN settings
bmbouter Oct 31, 2019
fa0c69d
Removing the content_origin setting since pulp_operator sets it
Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ spec:
username: pulp
password: pulp
admin_password: pulp
pulp_settings:
content_host: $(hostname):24816
CRYAML

# Install k3s, lightweight Kubernetes
Expand Down
2 changes: 2 additions & 0 deletions .travis/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export FUNC_TEST_SCRIPT=$TRAVIS_BUILD_DIR/.travis/func_test_script.sh
export DJANGO_SETTINGS_MODULE=pulpcore.app.settings

if [ "$TEST" = 'docs' ]; then


cd docs
make html
cd ..
Expand Down
1 change: 1 addition & 0 deletions CHANGES/5629.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Set `content_origin` in Travis settings and update tests to match.
10 changes: 1 addition & 9 deletions pulp_file/tests/functional/api/test_pulp_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"""Tests whether Pulp handles PULP_MANIFEST information."""
import csv
import unittest
from functools import reduce
from urllib.parse import urljoin

from pulp_smash import api, config
Expand Down Expand Up @@ -60,14 +59,7 @@ def test_access_error(self):

def download_pulp_manifest(self, distribution, unit_path):
"""Download pulp manifest."""
unit_url = reduce(
urljoin,
(
self.cfg.get_content_host_base_url(),
"//" + distribution["base_url"] + "/",
unit_path,
),
)
unit_url = urljoin(distribution["base_url"] + "/", unit_path)
return self.client.using_handler(api.safe_handler).get(unit_url)


Expand Down
1 change: 0 additions & 1 deletion template_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ plugin_name: pulp_file
plugin_snake: pulp_file
plugin_snake_short: file
pulp_settings:
content_host: $(hostname):24816
pydocstyle: true
pypi_username: pulp
test: false
Expand Down