Skip to content

Commit

Permalink
Merge pull request #296 from subshell/bugfix/issue-295_gcs_azure_cach…
Browse files Browse the repository at this point in the history 
…e_config

recognize cache options for gcp and azure during register
  • Loading branch information
@guenhter
guenhter authored Nov 16, 2023
2 parents 3c7a016 + a831483 commit 2a11af4
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 0 deletions.
30 changes: 30 additions & 0 deletions tasks/register-runner-container.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,24 @@
{% if gitlab_runner.cache_s3_bucket_location is defined %}
--cache-s3-bucket-location '{{ gitlab_runner.cache_s3_bucket_location }}'
{% endif %}
{% if gitlab_runner.cache_gcs_bucket_name is defined %}
--cache-gcs-bucket-name '{{ gitlab_runner.cache_gcs_bucket_name }}'
{% endif %}
{% if gitlab_runner.cache_gcs_credentials_file is defined %}
--cache-gcs-credentials-file '{{ gitlab_runner.cache_gcs_credentials_file }}'
{% endif %}
{% if gitlab_runner.cache_gcs_access_id is defined %}
--cache-gcs-access-id '{{ gitlab_runner.cache_gcs_access_id }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_name is defined %}
--cache-azure-account-name '{{ gitlab_runner.cache_azure_account_name }}'
{% endif %}
{% if gitlab_runner.cache_azure_container_name is defined %}
--cache-azure-container-name '{{ gitlab_runner.cache_azure_container_name }}'
{% endif %}
{% if gitlab_runner.cache_azure_storage_domain is defined %}
--cache-azure-storage-domain '{{ gitlab_runner.cache_azure_storage_domain }}'
{% endif %}
{% if gitlab_runner.builds_dir|default(false) %}
--builds-dir '{{ gitlab_runner.builds_dir }}'
{% endif %}
Expand All @@ -99,6 +117,12 @@
{% if gitlab_runner.cache_s3_secret_key is defined %}
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key|hash("sha1") }}'
{% endif %}
{% if gitlab_runner.cache_gcs_private_key is defined %}
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_key is defined %}
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
{% endif %}
{% if gitlab_runner.ssh_password is defined %}
--ssh-password '{{ gitlab_runner.ssh_password|hash("sha1") }}'
{% endif %}
Expand All @@ -123,6 +147,12 @@
{% if gitlab_runner.cache_s3_secret_key is defined %}
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key }}'
{% endif %}
{% if gitlab_runner.cache_gcs_private_key is defined %}
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_key is defined %}
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
{% endif %}
{% if gitlab_runner.ssh_password is defined %}
--ssh-password '{{ gitlab_runner.ssh_password }}'
{% endif %}
Expand Down
30 changes: 30 additions & 0 deletions tasks/register-runner-windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,24 @@
{% if gitlab_runner.cache_s3_bucket_location is defined %}
--cache-s3-bucket-location '{{ gitlab_runner.cache_s3_bucket_location }}'
{% endif %}
{% if gitlab_runner.cache_gcs_bucket_name is defined %}
--cache-gcs-bucket-name '{{ gitlab_runner.cache_gcs_bucket_name }}'
{% endif %}
{% if gitlab_runner.cache_gcs_credentials_file is defined %}
--cache-gcs-credentials-file '{{ gitlab_runner.cache_gcs_credentials_file }}'
{% endif %}
{% if gitlab_runner.cache_gcs_access_id is defined %}
--cache-gcs-access-id '{{ gitlab_runner.cache_gcs_access_id }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_name is defined %}
--cache-azure-account-name '{{ gitlab_runner.cache_azure_account_name }}'
{% endif %}
{% if gitlab_runner.cache_azure_container_name is defined %}
--cache-azure-container-name '{{ gitlab_runner.cache_azure_container_name }}'
{% endif %}
{% if gitlab_runner.cache_azure_storage_domain is defined %}
--cache-azure-storage-domain '{{ gitlab_runner.cache_azure_storage_domain }}'
{% endif %}
{% if gitlab_runner.builds_dir|default(false) %}
--builds-dir '{{ gitlab_runner.builds_dir }}'
{% endif %}
Expand All @@ -98,6 +116,12 @@
{% if gitlab_runner.cache_s3_secret_key is defined %}
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key|hash("sha1") }}'
{% endif %}
{% if gitlab_runner.cache_gcs_private_key is defined %}
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_key is defined %}
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
{% endif %}
{% if gitlab_runner.ssh_password is defined %}
--ssh-password '{{ gitlab_runner.ssh_password|hash("sha1") }}'
{% endif %}
Expand All @@ -119,6 +143,12 @@
{% if gitlab_runner.cache_s3_secret_key is defined %}
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key }}'
{% endif %}
{% if gitlab_runner.cache_gcs_private_key is defined %}
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_key is defined %}
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
{% endif %}
{% if gitlab_runner.ssh_password is defined %}
--ssh-password '{{ gitlab_runner.ssh_password }}'
{% endif %}
Expand Down
30 changes: 30 additions & 0 deletions tasks/register-runner.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,24 @@
{% if gitlab_runner.cache_s3_bucket_location is defined %}
--cache-s3-bucket-location '{{ gitlab_runner.cache_s3_bucket_location }}'
{% endif %}
{% if gitlab_runner.cache_gcs_bucket_name is defined %}
--cache-gcs-bucket-name '{{ gitlab_runner.cache_gcs_bucket_name }}'
{% endif %}
{% if gitlab_runner.cache_gcs_credentials_file is defined %}
--cache-gcs-credentials-file '{{ gitlab_runner.cache_gcs_credentials_file }}'
{% endif %}
{% if gitlab_runner.cache_gcs_access_id is defined %}
--cache-gcs-access-id '{{ gitlab_runner.cache_gcs_access_id }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_name is defined %}
--cache-azure-account-name '{{ gitlab_runner.cache_azure_account_name }}'
{% endif %}
{% if gitlab_runner.cache_azure_container_name is defined %}
--cache-azure-container-name '{{ gitlab_runner.cache_azure_container_name }}'
{% endif %}
{% if gitlab_runner.cache_azure_storage_domain is defined %}
--cache-azure-storage-domain '{{ gitlab_runner.cache_azure_storage_domain }}'
{% endif %}
{% if gitlab_runner.builds_dir|default(false) %}
--builds-dir '{{ gitlab_runner.builds_dir }}'
{% endif %}
Expand All @@ -134,6 +152,12 @@
{% if gitlab_runner.cache_s3_secret_key is defined %}
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key|hash("sha1") }}'
{% endif %}
{% if gitlab_runner.cache_gcs_private_key is defined %}
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_key is defined %}
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
{% endif %}
{% if gitlab_runner.ssh_password is defined %}
--ssh-password '{{ gitlab_runner.ssh_password|hash("sha1") }}'
{% endif %}
Expand All @@ -155,6 +179,12 @@
{% if gitlab_runner.cache_s3_secret_key is defined %}
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key }}'
{% endif %}
{% if gitlab_runner.cache_gcs_private_key is defined %}
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
{% endif %}
{% if gitlab_runner.cache_azure_account_key is defined %}
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
{% endif %}
{% if gitlab_runner.ssh_password is defined %}
--ssh-password '{{ gitlab_runner.ssh_password }}'
{% endif %}
Expand Down

0 comments on commit 2a11af4

Please sign in to comment.