Skip to content

Commit 1db8bb6

Browse files
committed
Fix tests to use http
[noissue]
1 parent ebee575 commit 1db8bb6

File tree

10 files changed

+15
-32
lines changed

10 files changed

+15
-32
lines changed

.ci/ansible/smash-config.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
"hostname": "pulp",
1313
"roles": {
1414
"api": {
15-
"port": 443,
16-
"scheme": "https",
15+
"port": 80,
16+
"scheme": "http",
1717
"service": "nginx"
1818
},
1919
"content": {
20-
"port": 443,
21-
"scheme": "https",
20+
"port": 80,
21+
"scheme": "http",
2222
"service": "pulp_content_app"
2323
},
2424
"pulp resource manager": {},

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
if: failure()
126126
run: |
127127
echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
128-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
128+
http --timeout 30 --check-status --pretty format --print hb http://pulp/pulp/api/v3/status/ || true
129129
docker images || true
130130
docker ps -a || true
131131
docker logs pulp || true

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- name: After failure
105105
if: failure()
106106
run: |
107-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
107+
http --timeout 30 --check-status --pretty format --print hb http://pulp/pulp/api/v3/status/ || true
108108
docker images || true
109109
docker ps -a || true
110110
docker logs pulp || true
@@ -215,7 +215,7 @@ jobs:
215215
- name: After failure
216216
if: failure()
217217
run: |
218-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
218+
http --timeout 30 --check-status --pretty format --print hb http://pulp/pulp/api/v3/status/ || true
219219
docker images || true
220220
docker ps -a || true
221221
docker logs pulp || true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
- name: After failure
177177
if: failure()
178178
run: |
179-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
179+
http --timeout 30 --check-status --pretty format --print hb http://pulp/pulp/api/v3/status/ || true
180180
docker images || true
181181
docker ps -a || true
182182
docker logs pulp || true

.github/workflows/scripts/install.sh

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,29 +70,14 @@ fi
7070

7171
cat >> vars/main.yaml << VARSYAML
7272
pulp_settings: null
73-
pulp_scheme: https
73+
pulp_scheme: http
7474
7575
pulp_container_tag: python36
7676
7777
VARSYAML
7878

7979
ansible-playbook build_container.yaml
8080
ansible-playbook start_container.yaml
81-
echo ::group::SSL
82-
# Copy pulp CA
83-
sudo docker cp pulp:/etc/pulp/certs/pulp_webserver.crt /usr/local/share/ca-certificates/pulp_webserver.crt
84-
85-
# Hack: adding pulp CA to certifi.where()
86-
CERTIFI=$(python -c 'import certifi; print(certifi.where())')
87-
cat /usr/local/share/ca-certificates/pulp_webserver.crt | sudo tee -a $CERTIFI
88-
89-
# Hack: adding pulp CA to default CA file
90-
CERT=$(python -c 'import ssl; print(ssl.get_default_verify_paths().openssl_cafile)')
91-
cat $CERTIFI | sudo tee -a $CERT
92-
93-
# Updating certs
94-
sudo update-ca-certificates
95-
echo ::endgroup::
9681

9782
echo ::group::PIP_LIST
9883
cmd_prefix bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"

.github/workflows/scripts/install_python_client.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
set -euv
1111

12-
export PULP_URL="${PULP_URL:-https://pulp}"
12+
export PULP_URL="${PULP_URL:-http://pulp}"
1313

1414
# make sure this script runs at the repo root
1515
cd "$(dirname "$(realpath -e "$0")")"/../../..

.github/workflows/scripts/install_ruby_client.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -euv
1212
# make sure this script runs at the repo root
1313
cd "$(dirname "$(realpath -e "$0")")"/../../..
1414

15-
export PULP_URL="${PULP_URL:-https://pulp}"
15+
export PULP_URL="${PULP_URL:-http://pulp}"
1616

1717
export REPORTED_VERSION=$(http $PULP_URL/pulp/api/v3/status/ | jq --arg plugin python --arg legacy_plugin pulp_python -r '.versions[] | select(.component == $plugin or .component == $legacy_plugin) | .version')
1818
export DESCRIPTION="$(git describe --all --exact-match `git rev-parse HEAD`)"

.github/workflows/scripts/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export FUNC_TEST_SCRIPT=$PWD/.github/workflows/scripts/func_test_script.sh
2626
export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
2727
export PULP_SETTINGS=$PWD/.ci/ansible/settings/settings.py
2828

29-
export PULP_URL="https://pulp"
29+
export PULP_URL="http://pulp"
3030

3131
if [[ "$TEST" = "docs" ]]; then
3232
cd docs

pulp_python/tests/functional/api/test_pypi_apis.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ def test_twine_upload(self):
179179
"-p",
180180
password,
181181
),
182-
capture_output=True,
183182
check=True,
184183
)
185184
tasks = task_api.list(reserved_resources_record=repo.pulp_href).results
@@ -203,7 +202,6 @@ def test_twine_upload(self):
203202
"-p",
204203
password,
205204
),
206-
capture_output=True,
207205
check=True,
208206
)
209207

@@ -221,9 +219,9 @@ def test_twine_upload(self):
221219
password,
222220
"--skip-existing",
223221
),
224-
capture_output=True,
222+
stdout=subprocess.PIPE,
225223
check=True,
226-
text=True
224+
universal_newlines=True
227225
)
228226
self.assertEqual(output.stdout.count("Skipping"), 2)
229227

template_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ plugin_snake: pulp_python
3838
post_job_template: null
3939
pre_job_template: null
4040
publish_docs_to_pulpprojectdotorg: true
41-
pulp_scheme: https
41+
pulp_scheme: http
4242
pulp_settings: null
4343
pulpcore_branch: 3.13
4444
pulpcore_pip_version_specifier: ~=3.13.0

0 commit comments

Comments
 (0)