Merge branch 'jkb/fix/ci/deploy-jobs-scheduled-pipelines' into 'develop'

Merge-Request: apple/vpn/protonvpn!2119 Approved-by: Shahin Katebi <[email protected]> Approved-by: Adam Viaud <[email protected]>
ProtonVPN · Nov 19, 2024 · dd10f09 · dd10f09
2 parents 77c10f2 + e0e9be7
commit dd10f09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Integration/Templates/gitlab-publish-jobs.yml b/Integration/Templates/gitlab-publish-jobs.yml
@@ -143,6 +143,13 @@ publish:gitlab:release:
   release:
     name: "{{ train }} {{ version }} ($TIMESTAMP)"
     tag_name: $CI_COMMIT_TAG
+    {% for commit in target|commits -%}
+    {% if commit|attrs:"Sprint-Started" %}
+    milestones:
+      - "{{ commit|attrs:"Sprint-Started" }}"
+    {% break %}
+    {% endif %}
+    {% endfor %}
     {% if release.body %}
     description: |
       {{ release.body|indent:6 }}

diff --git a/Integration/Templates/gitlab-test-jobs.yml b/Integration/Templates/gitlab-test-jobs.yml
@@ -106,7 +106,7 @@ atlas:deploy:pipenv:
             DESTINATION: Default
 
   rules:
-{% if config.build.ci.eventType == "merge_request_event" %}
+{% if config.build.ci.eventType == "merge_request_event" or config.build.ci.eventType == "schedule" %}
     - when: on_success
 {% else %}
     - when: manual
@@ -143,7 +143,9 @@ test:{{ config.name }}:ui:all:
     TEST_SUITE: UI-All
   extends:
     - .ui_test_template
-  {% if config.build.ci.eventType != "schedule" %}
+  {% if config.build.ci.eventType == "schedule" %}
+  when: on_success
+  {% else %}
   when: manual
   {% endif %}