File tree Expand file tree Collapse file tree 10 files changed +15
-32
lines changed
pulp_python/tests/functional/api Expand file tree Collapse file tree 10 files changed +15
-32
lines changed Original file line number Diff line number Diff line change 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" : {},
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 7070
7171cat >> vars/main.yaml << VARSYAML
7272pulp_settings: null
73- pulp_scheme: https
73+ pulp_scheme: http
7474
7575pulp_container_tag: python36
7676
7777VARSYAML
7878
7979ansible-playbook build_container.yaml
8080ansible-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
9782echo ::group::PIP_LIST
9883cmd_prefix bash -c " pip3 list && pip3 install pipdeptree && pipdeptree"
Original file line number Diff line number Diff line change 99
1010set -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
1515cd " $( dirname " $( realpath -e " $0 " ) " ) " /../../..
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ set -euv
1212# make sure this script runs at the repo root
1313cd " $( dirname " $( realpath -e " $0 " ) " ) " /../../..
1414
15- export PULP_URL=" ${PULP_URL:- https :// pulp} "
15+ export PULP_URL=" ${PULP_URL:- http :// pulp} "
1616
1717export 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' )
1818export DESCRIPTION=" $( git describe --all --exact-match ` git rev-parse HEAD` ) "
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ export FUNC_TEST_SCRIPT=$PWD/.github/workflows/scripts/func_test_script.sh
2626export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
2727export PULP_SETTINGS=$PWD /.ci/ansible/settings/settings.py
2828
29- export PULP_URL=" https ://pulp"
29+ export PULP_URL=" http ://pulp"
3030
3131if [[ " $TEST " = " docs" ]]; then
3232 cd docs
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ plugin_snake: pulp_python
3838post_job_template : null
3939pre_job_template : null
4040publish_docs_to_pulpprojectdotorg : true
41- pulp_scheme : https
41+ pulp_scheme : http
4242pulp_settings : null
4343pulpcore_branch : 3.13
4444pulpcore_pip_version_specifier : ~=3.13.0
You can’t perform that action at this time.
0 commit comments