fix: extra params and notification to prelease jobs (#167)

* fix: extra params and notification to prelease jobs * update tests
getoutreach · May 20, 2024 · 7188e12 · 7188e12
1 parent eb52e7a
commit 7188e12
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/templates/.circleci/config.yml.tpl b/templates/.circleci/config.yml.tpl
@@ -5,6 +5,7 @@ version: 2.1
 {{- $prereleaseBranch := stencil.Arg "releaseOptions.prereleasesBranch" }}
 {{- $testNodeClient := and (or (not (stencil.Arg "service")) (has "grpc" (stencil.Arg "serviceActivities"))) (has "node" (stencil.Arg "grpcClients")) }}
 {{- $defaultBranch := .Git.DefaultBranch | default "main" }}
+{{- $releaseFailureSlackChannel :=  stencil.Arg "notifications.slackChannel" }}
 orbs:
   shared: getoutreach/shared@{{ stencil.Arg "versions.devbase" | default (stencil.ApplyTemplate "devbase.orb_version") }}
   queue: eddiewebb/queue@2.2.1
@@ -140,6 +141,12 @@ workflows:
     jobs:
       - shared/trigger_rc_release:
           context: *contexts
+          {{- if $releaseFailureSlackChannel }}
+          release_failure_slack_channel: "{{ $releaseFailureSlackChannel }}"
+          {{- end }}
+          ## <<Stencil::Block(circleAutoTriggerRCExtra)>>
+{{ file.Block "circleAutoTriggerRCExtra" }}
+          ## <</Stencil::Block>>
   {{- end }}
 
   {{- if stencil.Arg "releaseOptions.enablePrereleases" }}
@@ -149,6 +156,12 @@ workflows:
     jobs:
       - shared/trigger_rc_release:
           context: *contexts
+          {{- if $releaseFailureSlackChannel }}
+          release_failure_slack_channel: "{{ $releaseFailureSlackChannel }}"
+          {{- end }}
+          ## <<Stencil::Block(circleManualTriggerRCExtra)>>
+{{ file.Block "circleManualTriggerRCExtra" }}
+          ## <</Stencil::Block>>
   {{- end }}
 
   release:
@@ -187,7 +200,6 @@ workflows:
           node_client: true
           {{- end }}
           context: *contexts
-          {{- $releaseFailureSlackChannel :=  stencil.Arg "notifications.slackChannel" }}
           {{- if $releaseFailureSlackChannel }}
           release_failure_slack_channel: "{{ $releaseFailureSlackChannel }}"
           {{- end }}
@@ -210,7 +222,9 @@ workflows:
       - shared/pre-release: &pre-release
           dryrun: false
           context: *contexts
-          release_failure_slack_channel: {{ $releaseFailureSlackChannel }}
+          {{- if $releaseFailureSlackChannel }}
+          release_failure_slack_channel: "{{ $releaseFailureSlackChannel }}"
+          {{- end }}
           ## <<Stencil::Block(circlePreReleaseExtra)>>
 {{ file.Block "circlePreReleaseExtra" }}
           ## <</Stencil::Block>>

diff --git a/...pshots/TestConfigForAutoPrerelease-.circleci-config.yml.tpl-.circleci-config.yml.snapshot b/...pshots/TestConfigForAutoPrerelease-.circleci-config.yml.tpl-.circleci-config.yml.snapshot
@@ -95,12 +95,18 @@ workflows:
     jobs:
       - shared/trigger_rc_release:
           context: *contexts
+          ## <<Stencil::Block(circleAutoTriggerRCExtra)>>
+
+          ## <</Stencil::Block>>
 
   manual-release-rc:
     when: << pipeline.parameters.release_rc>>
     jobs:
       - shared/trigger_rc_release:
           context: *contexts
+          ## <<Stencil::Block(circleManualTriggerRCExtra)>>
+
+          ## <</Stencil::Block>>
 
   release:
     when:
@@ -130,7 +136,6 @@ workflows:
       - shared/pre-release: &pre-release
           dryrun: false
           context: *contexts
-          release_failure_slack_channel: 
           ## <<Stencil::Block(circlePreReleaseExtra)>>
 
           ## <</Stencil::Block>>

diff --git a/templates/.snapshots/TestRenderAFile-.circleci-config.yml.tpl-.circleci-config.yml.snapshot b/templates/.snapshots/TestRenderAFile-.circleci-config.yml.tpl-.circleci-config.yml.snapshot
@@ -89,6 +89,9 @@ workflows:
     jobs:
       - shared/trigger_rc_release:
           context: *contexts
+          ## <<Stencil::Block(circleManualTriggerRCExtra)>>
+
+          ## <</Stencil::Block>>
 
   release:
     when:

diff --git a/...ots/TestRenderWithSkipE2eAndDocker-.circleci-config.yml.tpl-.circleci-config.yml.snapshot b/...ots/TestRenderWithSkipE2eAndDocker-.circleci-config.yml.tpl-.circleci-config.yml.snapshot
@@ -89,6 +89,9 @@ workflows:
     jobs:
       - shared/trigger_rc_release:
           context: *contexts
+          ## <<Stencil::Block(circleManualTriggerRCExtra)>>
+
+          ## <</Stencil::Block>>
 
   release:
     when: