Simplify stage names

.gitlab-ci.yml

@@ -13,11 +13,10 @@ default:
     - gitlab-org-docker
 
 stages:
-  - test
+  - custom
-  - deploy
+  - gitlab
-  - deploy-gitlab
+  - gitlab-assets
-  - deploy-gitlab-assets
+  - gitaly
-  - deploy-gitaly
   - automation
 
 variables:

.gitlab/ci/definitions.yml

@@ -1,5 +1,5 @@
 .build_and_push:
-  stage: deploy
+  stage: custom
   needs: []
   script:
     - ./scripts/lib/custom-docker-build

.gitlab/ci/gitaly.images.yml

@@ -3,7 +3,7 @@ gitaly:
   needs: []
   extends:
     - .build_and_push
-  stage: deploy-gitaly
+  stage: gitaly
   parallel:
     matrix:
       - DEBIAN: ['bullseye']

.gitlab/ci/gitlab.images.yml

@@ -2,7 +2,7 @@
 gitlab:
   extends:
     - .build_and_push
-  stage: deploy-gitlab
+  stage: gitlab
   variables:
     LFS: '2.9'
     YARN: '1.22'
@@ -22,7 +22,7 @@ gitlab:
 gitlab-assets:
   extends:
     - .build_and_push
-  stage: deploy-gitlab-assets
+  stage: gitlab-assets
   variables:
     LFS: '2.9'
     YARN: '1.22'