Merge branch 'fix-development-environment-stop-job-definition' into 'main'

Fix definition of the 'stop release development S3' job

See merge request gitlab-org/ci-cd/docker-machine!84

.gitlab/ci/yaml/_rules.gitlab-ci.yml

@@ -48,6 +48,13 @@
     when: never
   - <<: *if-canonical-merge-request-pipeline
 
+.rules:release:development:manual:
+  rules:
+  - <<: *if-not-canonical-namespace
+    when: never
+  - <<: *if-canonical-merge-request-pipeline
+    when: manual
+
 .rules:release:beta:
   rules:
   - <<: *if-not-canonical-namespace

.gitlab/ci/yaml/release.gitlab-ci.yml

@@ -11,11 +11,11 @@
   - openbsd amd64
   - windows amd64
   variables:
-    S3_URL: s3://${S3_BUCKET}/${CI_COMMIT_REF_NAME}
+    S3_URL: s3://${S3_BUCKET}/mr-${CI_MERGE_REQUEST_IID}
   script:
   - ./.gitlab/ci/scripts/release_s3.sh
   environment:
-    url: https://${S3_BUCKET}.s3.amazonaws.com/${CI_COMMIT_REF_NAME}/index.html
+    url: https://${S3_BUCKET}.s3.amazonaws.com/mr-${CI_MERGE_REQUEST_IID}/index.html
 
 release development S3:
   extends:
@@ -23,23 +23,25 @@ release development S3:
   - .release
   - .release_S3
   environment:
-    name: development/S3/${CI_COMMIT_REF_NAME}
-    on_stop: stop release development S3
+    name: development/S3/mr-${CI_MERGE_REQUEST_IID}
+    on_stop: 'stop release development S3'
 
 stop release development S3:
   dependencies: []
+  needs:
+  - release development S3
   extends:
-  - .rules:release:development
+  - .rules:release:development:manual
   - .release
   - .release_S3
   variables:
     GIT_STRATEGY: none
   script:
   - aws s3 rm ${S3_URL} --recursive
-  when: manual
   environment:
-    name: development/S3/${CI_COMMIT_REF_NAME}
+    name: development/S3/mr-${CI_MERGE_REQUEST_IID}
     action: stop
+  allow_failure: true
 
 release beta S3:
   extends: