Skip to content

Commit 2a11af4

Browse files
guenhterguenhter
authored
Merge pull request #296 from subshell/bugfix/issue-295_gcs_azure_cache_config
recognize cache options for gcp and azure during register
2 parents 3c7a016 + a831483 commit 2a11af4

File tree

3 files changed

+90
-0
lines changed

3 files changed

+90
-0
lines changed

‎tasks/register-runner-container.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,24 @@
7676
{% if gitlab_runner.cache_s3_bucket_location is defined %}
7777
--cache-s3-bucket-location '{{ gitlab_runner.cache_s3_bucket_location }}'
7878
{% endif %}
79+
{% if gitlab_runner.cache_gcs_bucket_name is defined %}
80+
--cache-gcs-bucket-name '{{ gitlab_runner.cache_gcs_bucket_name }}'
81+
{% endif %}
82+
{% if gitlab_runner.cache_gcs_credentials_file is defined %}
83+
--cache-gcs-credentials-file '{{ gitlab_runner.cache_gcs_credentials_file }}'
84+
{% endif %}
85+
{% if gitlab_runner.cache_gcs_access_id is defined %}
86+
--cache-gcs-access-id '{{ gitlab_runner.cache_gcs_access_id }}'
87+
{% endif %}
88+
{% if gitlab_runner.cache_azure_account_name is defined %}
89+
--cache-azure-account-name '{{ gitlab_runner.cache_azure_account_name }}'
90+
{% endif %}
91+
{% if gitlab_runner.cache_azure_container_name is defined %}
92+
--cache-azure-container-name '{{ gitlab_runner.cache_azure_container_name }}'
93+
{% endif %}
94+
{% if gitlab_runner.cache_azure_storage_domain is defined %}
95+
--cache-azure-storage-domain '{{ gitlab_runner.cache_azure_storage_domain }}'
96+
{% endif %}
7997
{% if gitlab_runner.builds_dir|default(false) %}
8098
--builds-dir '{{ gitlab_runner.builds_dir }}'
8199
{% endif %}
@@ -99,6 +117,12 @@
99117
{% if gitlab_runner.cache_s3_secret_key is defined %}
100118
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key|hash("sha1") }}'
101119
{% endif %}
120+
{% if gitlab_runner.cache_gcs_private_key is defined %}
121+
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
122+
{% endif %}
123+
{% if gitlab_runner.cache_azure_account_key is defined %}
124+
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
125+
{% endif %}
102126
{% if gitlab_runner.ssh_password is defined %}
103127
--ssh-password '{{ gitlab_runner.ssh_password|hash("sha1") }}'
104128
{% endif %}
@@ -123,6 +147,12 @@
123147
{% if gitlab_runner.cache_s3_secret_key is defined %}
124148
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key }}'
125149
{% endif %}
150+
{% if gitlab_runner.cache_gcs_private_key is defined %}
151+
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
152+
{% endif %}
153+
{% if gitlab_runner.cache_azure_account_key is defined %}
154+
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
155+
{% endif %}
126156
{% if gitlab_runner.ssh_password is defined %}
127157
--ssh-password '{{ gitlab_runner.ssh_password }}'
128158
{% endif %}

‎tasks/register-runner-windows.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@
7575
{% if gitlab_runner.cache_s3_bucket_location is defined %}
7676
--cache-s3-bucket-location '{{ gitlab_runner.cache_s3_bucket_location }}'
7777
{% endif %}
78+
{% if gitlab_runner.cache_gcs_bucket_name is defined %}
79+
--cache-gcs-bucket-name '{{ gitlab_runner.cache_gcs_bucket_name }}'
80+
{% endif %}
81+
{% if gitlab_runner.cache_gcs_credentials_file is defined %}
82+
--cache-gcs-credentials-file '{{ gitlab_runner.cache_gcs_credentials_file }}'
83+
{% endif %}
84+
{% if gitlab_runner.cache_gcs_access_id is defined %}
85+
--cache-gcs-access-id '{{ gitlab_runner.cache_gcs_access_id }}'
86+
{% endif %}
87+
{% if gitlab_runner.cache_azure_account_name is defined %}
88+
--cache-azure-account-name '{{ gitlab_runner.cache_azure_account_name }}'
89+
{% endif %}
90+
{% if gitlab_runner.cache_azure_container_name is defined %}
91+
--cache-azure-container-name '{{ gitlab_runner.cache_azure_container_name }}'
92+
{% endif %}
93+
{% if gitlab_runner.cache_azure_storage_domain is defined %}
94+
--cache-azure-storage-domain '{{ gitlab_runner.cache_azure_storage_domain }}'
95+
{% endif %}
7896
{% if gitlab_runner.builds_dir|default(false) %}
7997
--builds-dir '{{ gitlab_runner.builds_dir }}'
8098
{% endif %}
@@ -98,6 +116,12 @@
98116
{% if gitlab_runner.cache_s3_secret_key is defined %}
99117
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key|hash("sha1") }}'
100118
{% endif %}
119+
{% if gitlab_runner.cache_gcs_private_key is defined %}
120+
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
121+
{% endif %}
122+
{% if gitlab_runner.cache_azure_account_key is defined %}
123+
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
124+
{% endif %}
101125
{% if gitlab_runner.ssh_password is defined %}
102126
--ssh-password '{{ gitlab_runner.ssh_password|hash("sha1") }}'
103127
{% endif %}
@@ -119,6 +143,12 @@
119143
{% if gitlab_runner.cache_s3_secret_key is defined %}
120144
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key }}'
121145
{% endif %}
146+
{% if gitlab_runner.cache_gcs_private_key is defined %}
147+
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
148+
{% endif %}
149+
{% if gitlab_runner.cache_azure_account_key is defined %}
150+
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
151+
{% endif %}
122152
{% if gitlab_runner.ssh_password is defined %}
123153
--ssh-password '{{ gitlab_runner.ssh_password }}'
124154
{% endif %}

‎tasks/register-runner.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,24 @@
108108
{% if gitlab_runner.cache_s3_bucket_location is defined %}
109109
--cache-s3-bucket-location '{{ gitlab_runner.cache_s3_bucket_location }}'
110110
{% endif %}
111+
{% if gitlab_runner.cache_gcs_bucket_name is defined %}
112+
--cache-gcs-bucket-name '{{ gitlab_runner.cache_gcs_bucket_name }}'
113+
{% endif %}
114+
{% if gitlab_runner.cache_gcs_credentials_file is defined %}
115+
--cache-gcs-credentials-file '{{ gitlab_runner.cache_gcs_credentials_file }}'
116+
{% endif %}
117+
{% if gitlab_runner.cache_gcs_access_id is defined %}
118+
--cache-gcs-access-id '{{ gitlab_runner.cache_gcs_access_id }}'
119+
{% endif %}
120+
{% if gitlab_runner.cache_azure_account_name is defined %}
121+
--cache-azure-account-name '{{ gitlab_runner.cache_azure_account_name }}'
122+
{% endif %}
123+
{% if gitlab_runner.cache_azure_container_name is defined %}
124+
--cache-azure-container-name '{{ gitlab_runner.cache_azure_container_name }}'
125+
{% endif %}
126+
{% if gitlab_runner.cache_azure_storage_domain is defined %}
127+
--cache-azure-storage-domain '{{ gitlab_runner.cache_azure_storage_domain }}'
128+
{% endif %}
111129
{% if gitlab_runner.builds_dir|default(false) %}
112130
--builds-dir '{{ gitlab_runner.builds_dir }}'
113131
{% endif %}
@@ -134,6 +152,12 @@
134152
{% if gitlab_runner.cache_s3_secret_key is defined %}
135153
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key|hash("sha1") }}'
136154
{% endif %}
155+
{% if gitlab_runner.cache_gcs_private_key is defined %}
156+
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
157+
{% endif %}
158+
{% if gitlab_runner.cache_azure_account_key is defined %}
159+
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
160+
{% endif %}
137161
{% if gitlab_runner.ssh_password is defined %}
138162
--ssh-password '{{ gitlab_runner.ssh_password|hash("sha1") }}'
139163
{% endif %}
@@ -155,6 +179,12 @@
155179
{% if gitlab_runner.cache_s3_secret_key is defined %}
156180
--cache-s3-secret-key '{{ gitlab_runner.cache_s3_secret_key }}'
157181
{% endif %}
182+
{% if gitlab_runner.cache_gcs_private_key is defined %}
183+
--cache-gcs-private-key '{{ gitlab_runner.cache_gcs_private_key }}'
184+
{% endif %}
185+
{% if gitlab_runner.cache_azure_account_key is defined %}
186+
--cache-azure-account-key '{{ gitlab_runner.cache_azure_account_key }}'
187+
{% endif %}
158188
{% if gitlab_runner.ssh_password is defined %}
159189
--ssh-password '{{ gitlab_runner.ssh_password }}'
160190
{% endif %}

0 commit comments

Comments
 (0)