Skip to content

Commit

Permalink
Fix flatpak settings for the S3 test runner
Browse files Browse the repository at this point in the history
The flatpak_index setting has to be explicitly set to false because of
the global pulp settings definition.

Enabling the indexing for the S3 test runner would cause
pulp_container/tests/functional/api/test_flatpak.py to fail due to
<https://gitlab.gnome.org/GNOME/libsoup/-/issues/357>.

[noissue]
  • Loading branch information
lubosmj committed Aug 2, 2023
1 parent 4b2285c commit 0bfc32c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-238-gb4b66d6
2021.08.26-240-gd3a60ef
2 changes: 1 addition & 1 deletion .github/workflows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ if [ "$TEST" = "s3" ]; then
sed -i -e '$a s3_test: true\
minio_access_key: "'$MINIO_ACCESS_KEY'"\
minio_secret_key: "'$MINIO_SECRET_KEY'"\
pulp_scenario_settings: null\
pulp_scenario_settings: {"flatpak_index": false}\
' vars/main.yaml
export PULP_API_ROOT="/rerouted/djnd/"
fi
Expand Down
9 changes: 3 additions & 6 deletions template_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This config represents the latest values used when running the plugin-template. Any settings that
# were not present before running plugin-template have been added with their default values.

# generated with [email protected]238-gb4b66d6
# generated with [email protected]240-gd3a60ef

additional_repos: []
api_root: /pulp/
Expand Down Expand Up @@ -66,11 +66,8 @@ pulp_settings:
pulp_settings_azure:
flatpak_index: true
pulp_settings_gcp: null
# Do not enable flatpak_index for s3 for now, as it would cause
# pulp_container/tests/functional/api/test_flatpak.py to fail due to
# <https://gitlab.gnome.org/GNOME/libsoup/-/issues/357> "Odd 400 response with https GET 302
# redirecting to http":
pulp_settings_s3: null
pulp_settings_s3:
flatpak_index: false
pulp_settings_stream: null
pulpprojectdotorg_key_id: aa499d7938ed
pydocstyle: true
Expand Down

0 comments on commit 0bfc32c

Please sign in to comment.