Skip to content

Commit 7cda443

Browse files
Tony WeberRedhawkDeployer
authored andcommitted
Signing commit for REDHAWK 2.2.9
2 parents f2c339f + aef7a15 commit 7cda443

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

.gitlab-ci.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -157,37 +157,36 @@ frontend:el7:
157157
trigger:
158158
project: mpf/rf/redhawk-testing/core-framework
159159
# Feature branches trigger a test pipeline using the develop branch
160-
# from which they were forked unless overridden here.
160+
# from which they were branched unless overridden here.
161161
branch: $rh_lts_branch
162162

163163
# For bug/feature branches, require the developer to manually trigger the tests
164164
test-trigger:branch:
165165
<<: *trigger-common
166-
when: manual
167-
only:
168-
- branches
169-
except:
170-
- master
171-
- /^develop.*$/
166+
variables:
167+
core_framework_ref_name: $CI_COMMIT_REF_NAME
168+
core_framework_ref_slug: $CI_COMMIT_REF_SLUG
169+
rules:
170+
- if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH !~ /^develop/ && $CI_COMMIT_BRANCH !~ /^master/
171+
when: manual
172172

173173
# For develop branches, automatically trigger test pipeline
174174
test-trigger:develop:
175175
<<: *trigger-common
176-
only:
177-
- /^develop.*$/
176+
rules:
177+
- if: $CI_COMMIT_BRANCH =~ /^develop/
178178

179-
# For develop branches and tags, automatically trigger test pipeline
180-
test-trigger:release:
179+
# For release candidate tags, automatically trigger test pipeline
180+
test-trigger:release-candidate:
181181
stage: deploy
182182
variables:
183-
triggering_ref_name: $CI_COMMIT_REF_NAME
183+
core_framework_ref_name: $CI_COMMIT_REF_NAME
184+
core_framework_ref_slug: $CI_COMMIT_REF_SLUG
184185
trigger:
185186
project: mpf/rf/redhawk-testing/core-framework
186-
branch: $CI_COMMIT_REF_NAME
187-
only:
188-
- tags
189-
except:
190-
- /^(\d+\.)?(\d+)?(\.\d+)$/
187+
branch: $rh_lts_branch
188+
rules:
189+
- if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc([0-9]+)$/
191190

192191
.abi-common: &abi-common
193192
image: ${docker_registry}redhawk/rpmbuild:el7-x86_64

0 commit comments

Comments
 (0)