File tree Expand file tree Collapse file tree 7 files changed +25
-9
lines changed
Expand file tree Collapse file tree 7 files changed +25
-9
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,9 @@ RUN pip3 install \
2020{% - if azure_test | default (false ) -%}
2121{{ " " }}django-storages[azure]>=1.12.2
2222{% - endif -%}
23+ {% - if gcp_test | default (false ) -%}
24+ {{ " " }}django-storages[google]>=1.13.2
25+ {% - endif -%}
2326{% - for item in plugins -%}
2427{% - if item .name == "pulp-certguard" -%}
2528{{ " " }}python-dateutil rhsm
Original file line number Diff line number Diff line change @@ -63,3 +63,10 @@ AZURE_OVERWRITE_FILES = True
6363AZURE_URL_EXPIRATION_SECS = 120
6464AZURE_CONNECTION_STRING = 'DefaultEndpointsProtocol={{ pulp_scheme }};AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint={{ pulp_scheme }}://ci-azurite:10000/devstoreaccount1;'
6565{% endif %}
66+
67+ {% if gcp_test | default (false ) %}
68+ DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
69+ MEDIA_ROOT = ""
70+ GS_BUCKET_NAME = "gcppulp"
71+ GS_CUSTOM_ENDPOINT = "http://ci-gcp:4443"
72+ {% endif %}
Original file line number Diff line number Diff line change 1- 2021.08.26-190-ge8465b5
1+ 2021.08.26-192-gba67a84
Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ cd ..
115115
116116
117117
118- git clone --depth=1 https://github.com/pulp/pulp_file.git --branch main
118+ git clone --depth=1 https://github.com/pulp/pulp_file.git --branch 1.11
119119cd pulp_file
120120
121121if [ -n " $PULP_FILE_PR_NUMBER " ]; then
Original file line number Diff line number Diff line change @@ -33,10 +33,10 @@ tail -v -n +1 .ci/ansible/settings/settings.* ~/.config/pulp_smash/settings.json
3333cmd_prefix bash -c " echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/nopasswd"
3434cmd_prefix bash -c " usermod -a -G wheel pulp"
3535
36- SCENARIOS=(" pulp" " performance" " azure" " s3" " stream" " plugin-from-pypi" " generate-bindings" " lowerbounds" )
36+ SCENARIOS=(" pulp" " performance" " azure" " gcp " " s3" " stream" " plugin-from-pypi" " generate-bindings" " lowerbounds" )
3737if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
3838 # Many functional tests require these
39- cmd_prefix dnf install -yq lsof which dnf-plugins-core
39+ cmd_prefix dnf install -yq lsof which
4040fi
4141
4242if [[ " ${REDIS_DISABLED:- false} " == true ]]; then
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ TAG=ci_build
2828if [ -e $REPO_ROOT /../pulp_file ]; then
2929 PULP_FILE=./pulp_file
3030else
31- PULP_FILE=git+https://github.com/pulp/pulp_file.git@main
31+ PULP_FILE=git+https://github.com/pulp/pulp_file.git@1.11
3232fi
3333if [ -e $REPO_ROOT /../pulp-certguard ]; then
3434 PULP_CERTGUARD=./pulp-certguard
@@ -76,7 +76,7 @@ pulp_container_tag: https
7676
7777VARSYAML
7878
79- SCENARIOS=(" pulp" " performance" " azure" " s3" " stream" " plugin-from-pypi" " generate-bindings" " lowerbounds" )
79+ SCENARIOS=(" pulp" " performance" " azure" " gcp " " s3" " stream" " plugin-from-pypi" " generate-bindings" " lowerbounds" )
8080if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
8181 sed -i -e ' /^services:/a \
8282 - name: pulp-fixtures\
Original file line number Diff line number Diff line change 11# This config represents the latest values used when running the plugin-template. Any settings that
22# were not present before running plugin-template have been added with their default values.
33
4- # generated with plugin_template@2021.08.26-174-g56e0727
4+ # generated with plugin_template@2021.08.26-192-gba67a84
55
66additional_repos :
7- - branch : main
7+ - branch : 1.11
88 name : pulp_file
99 pytest_args : pulp_file.tests.functional
1010- branch : main
@@ -19,7 +19,10 @@ check_stray_pulpcore_imports: false
1919cherry_pick_automation : false
2020ci_env : {}
2121ci_trigger : ' {pull_request: {branches: ['' *'' ]}}'
22- ci_update_branches : ["3.16", "3.18", "3.21"]
22+ ci_update_branches :
23+ - ' 3.16'
24+ - ' 3.18'
25+ - ' 3.21'
2326core_import_allowed : []
2427coverage : true
2528deploy_client_to_pypi : true
@@ -62,6 +65,7 @@ pulp_settings:
6265 - /tmp
6366 orphan_protection_time : 0
6467pulp_settings_azure : null
68+ pulp_settings_gcp : null
6569pulp_settings_s3 : null
6670pulp_settings_stream : null
6771pulpcore_branch : null
@@ -88,6 +92,8 @@ test_bindings: true
8892test_cli : true
8993test_deprecations : true
9094test_fips_nightly : false
95+ test_gcp : false
96+ test_lowerbounds : true
9197test_performance : false
9298test_released_plugin_with_next_pulpcore_release : false
9399test_reroute : true
You can’t perform that action at this time.
0 commit comments