diff --git a/general/security/how_to_sync_security_with_canonical.md b/general/security/how_to_sync_security_with_canonical.md index bb0f7284292697223bb9e131b8706b6ba001aff6..d7f2fd495c602a56e4018ae13c833319275f0191 100644 --- a/general/security/how_to_sync_security_with_canonical.md +++ b/general/security/how_to_sync_security_with_canonical.md @@ -30,7 +30,7 @@ At the end of the security release we re-sync the Security and Canonical reposit During the 'early-merge' phase of a security release, security fixes are being merged to the Security master branch at the same time as regular changes are being merged to the Canonical master branch. The merge train handles the divergance to bring the Canonical changes into the Security master to allow changes to be included in upcoming deployments. -If a change being merged into Canonical master conflicts with a change being merged into the Security master we see the merge train failure error in the #g_delivery Slack channel. +If a change being merged into Canonical master conflicts with a change being merged into the Security master we see the merge train failure error in the #g_release_and_deploy Slack channel. If the merge train fails, no new changes will be recived from Canonical master until the error is resolved. diff --git a/general/security/utilities/merge_train.md b/general/security/utilities/merge_train.md index 7c8479d843879e556aa6c2b7c14d1145bdd26522..0a82f00ea571bb7964eb833336279512827119b9 100644 --- a/general/security/utilities/merge_train.md +++ b/general/security/utilities/merge_train.md @@ -61,7 +61,7 @@ with the name `GitLab EE security/master sync`. There's a chance of a file being modified both on Canonical and on Security, if this happens merge-train will fail when performing the merge between the two repositories. -The failure will generate a notification on the `#g_delivery` Slack channel. +The failure will generate a notification on the `#g_release_and_deploy` Slack channel. Solving this will require coordination by the Release Managers: * Analyze how difficult it is to recover from breakage. diff --git a/general/slack-automated-response.md b/general/slack-automated-response.md index 664f2ecba6e596c614028de68edf3f879fc3587a..c52aff5f87331e7866f91add36ccbfca10d90854 100644 --- a/general/slack-automated-response.md +++ b/general/slack-automated-response.md @@ -108,7 +108,7 @@ to the responses or addition of new emoji triggers should be: 1. **Tested** in `#release-tools-test` channel first 1. **Documented** in this file and the Slack canvas [Emojis for #releases Automated Response] available in the `#releases` channel -1. **Communicated** to the `Release and Deploy` team in `#g_delivery` +1. **Communicated** to the `Release and Deploy` team in `#g_release_and_deploy` The `Release and Deploy` (Delivery) Team members are added as workflow managers so they can update the existing workflows.