@@ -121,13 +121,21 @@ fossa:
121
121
creds-helper init
122
122
eval $(creds-helper aws --eval "aws:v1/o11y-infra/role/o11y_gdi_otel_releaser_role")
123
123
124
+ . :
125
+ - if : $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*/
126
+
127
+ .main-merge-condition :
128
+ - if : $CI_COMMIT_BRANCH == "main"
129
+
124
130
.trigger-filter :
125
- only :
126
- variables :
127
- - $CI_COMMIT_BRANCH == "main"
128
- - $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*/
129
- except :
130
- - schedules
131
+ rules :
132
+ - &main-condition
133
+ if : $CI_COMMIT_BRANCH == "main"
134
+ - &release-condition
135
+ if : $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*/
136
+ - &no-schedules-condition
137
+ if : $CI_PIPELINE_SOURCE == "schedule"
138
+ when : never
131
139
132
140
.deploy-release :
133
141
image : ' ${DOCKER_CICD_REPO}/ci-container/python-3.12-bookworm:3.5.0'
@@ -431,7 +439,13 @@ agent-bundle-windows:
431
439
artifacts :
432
440
paths :
433
441
- dist/agent-bundle_windows_amd64.zip
434
-
442
+ .ta-trigger :
443
+ rules :
444
+ - <<*main-condition
445
+ - <<*release-condition
446
+ - <<*no-schedules-condition
447
+ - if : $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_TAG == null && $CI_COMMIT_REF_PROTECTED == 'true'
448
+ when : manual
435
449
.auth-setup :
436
450
id_tokens :
437
451
CI_JOB_JWT :
@@ -474,7 +488,7 @@ agent-bundle-windows:
474
488
475
489
package-technical-addon :
476
490
extends :
477
- - .trigger-filter
491
+ - .ta-trigger
478
492
image : " ${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
479
493
stage : " package"
480
494
script : |
@@ -491,7 +505,7 @@ package-technical-addon:
491
505
test-happypath-ta :
492
506
image : " ${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
493
507
extends :
494
- - .trigger-filter
508
+ - .ta-trigger
495
509
- .auth-setup
496
510
stage : orca-tests
497
511
dependencies :
@@ -523,7 +537,7 @@ test-happypath-ta:
523
537
test-collectd-ta :
524
538
image : " ${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
525
539
extends :
526
- - .trigger-filter
540
+ - .ta-trigger
527
541
- .auth-setup
528
542
stage : orca-tests
529
543
variables :
@@ -585,7 +599,7 @@ test-gateway-ta:
585
599
- " $BUILD_DIR/$CI_JOB_ID/**/*"
586
600
AppInspect_local :
587
601
extends :
588
- - .trigger-filter
602
+ - .ta-trigger
589
603
dependencies :
590
604
- " package-technical-addon"
591
605
stage : code-analysis
0 commit comments