Cleanup CI stage names

- Cleanup stage names.
- Remove obsolete CI templates.

Signed-off-by: Balasankar 'Balu' C <[email protected]>

Author: balasankarc

.gitlab-ci.yml

@@ -12,14 +12,9 @@ stages:
   - qa-release
   - validate
   - metrics
-  - slow_jobs
-  - raspbian-release
   - aws-marketplace-release
   - notification_fail
-  - trigger-package
-  - trigger-docker
-  - trigger-ha-validate
-  - trigger-qa
+  - qa
   - verify
 
 include:

gitlab-ci-config/dev-gitlab-org.yml

@@ -83,7 +83,6 @@
 
 .rpi_branch_template: &rpi_branch_build
   extends: .branch_template
-  stage: slow_jobs
   variables:
     NO_SOURCEMAPS: "true"
   tags: !reference [.distribution-armhf-tags]
@@ -143,7 +142,6 @@
 
 .rpi_tag_template: &rpi_tag_build
   extends: .tag_template
-  stage: slow_jobs
   variables:
     NO_SOURCEMAPS: "true"
   tags: !reference [.distribution-armhf-tags]
@@ -224,7 +222,6 @@
   variables:
     RASPBERRY_REPO: "raspberry-pi2"
     INCLUDE_PACKAGECLOUD: "true"
-  stage: raspbian-release
   retry: 2
   rules:
     - !reference [.default_rules, rules]
@@ -1078,7 +1075,7 @@ manifest-upload:
       when: manual
 
 RAT-Tag:
-  stage: slow_jobs
+  stage: qa
   image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
   script:
     - bundle exec rake qa:rat:tag

gitlab-ci-config/gitlab-com.yml

@@ -34,26 +34,6 @@
   needs:
     - rubocop
 
-.trigger-package-cache:
-  cache:
-    key: "Ubuntu-22.04-branch-${BUILDER_IMAGE_REVISION}-${CACHE_EDITION}${CACHE_KEY_SUFFIX}"
-    paths:
-      - cache
-      - gems
-      - assets_cache
-      - node_modules
-    policy: $CACHE_POLICY
-
-.trigger-fips-package-cache:
-  cache:
-    key: "Ubuntu-22.04-fips-branch-${BUILDER_IMAGE_REVISION}-${CACHE_EDITION}${CACHE_KEY_SUFFIX}"
-    paths:
-      - cache
-      - gems
-      - assets_cache
-      - node_modules
-    policy: $CACHE_POLICY
-
 .install-gems: &install-gems
   - gem install bundler:${BUNDLER_VERSION}
   - bundle config build.ffi --disable-system-libffi
@@ -62,33 +42,6 @@
   - bundle install -j $(nproc)
   - bundle binstubs --all
 
-.trigger-package-common:
-  extends: .trigger-package-cache
-  variables:
-  image: "${BUILDER_IMAGE_REGISTRY}/${BASE_OS}:${BUILDER_IMAGE_REVISION}"
-  stage: trigger-package
-  script:
-    - !reference [.build-package]
-    # Renaming so we can easily generate the artifact URL
-    - mv $PACKAGE_DIRECTORY/*.deb $PACKAGE_DIRECTORY/gitlab.deb
-    - mv $PACKAGE_DIRECTORY/*.deb.size $PACKAGE_DIRECTORY/gitlab.deb.size
-  artifacts:
-    expire_in: 3 days
-    when: always
-    paths:
-      - pkg/
-  tags: !reference [.distribution-amd64-tags]
-  needs:
-    - job: fetch-assets
-      optional: true
-    - job: generate-facts
-      optional: true
-      artifacts: true
-  rules:
-    - if: '$PIPELINE_TYPE =~ /TRIGGERED_(CE|EE)_PIPELINE/'
-    - if: '$PIPELINE_TYPE == "DURATION_PLOTTER_PIPELINE"'
-    - if: '$PIPELINE_TYPE == "TRIGGER_CACHE_UPDATE_PIPELINE"'
-
 .spec_template: &spec_template
   extends: .gems-cache-os-dependent
   stage: tests
@@ -164,7 +117,7 @@
   ee: "true"
 
 .ce-trigger-job:
-  stage: trigger-package
+  stage: qa
   trigger:
     include: '.gitlab-ci.yml'
     strategy: depend
@@ -502,9 +455,9 @@ update-knapsack:
 ############################
 
 package_size_check:
-  extends: .trigger-package-cache
+  extends: .gems-cache
   image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
-  stage: trigger-qa
+  stage: qa
   script:
     - bundle exec rake build:package:generate_sizefile
     - bundle exec rake check:package_size
@@ -517,7 +470,7 @@ package_size_check:
 qa-subset-test:
   extends:
     - .qa-template
-  stage: trigger-qa
+  stage: qa
   variables:
     QA_OMNIBUS_MR_TESTS: "only-smoke-reliable"
     QA_RUN_TYPE: ${CI_JOB_NAME}
@@ -549,7 +502,7 @@ qa-subset-test:
 qa-remaining-test-manual:
   extends:
     - .qa-template
-  stage: trigger-qa
+  stage: qa
   variables:
     QA_RUN_TYPE: ${CI_JOB_NAME}
     QA_OMNIBUS_MR_TESTS: "except-smoke-reliable"
@@ -576,7 +529,7 @@ qa-remaining-test-manual:
 
 letsencrypt-test:
   extends: .docker_job
-  stage: trigger-qa
+  stage: qa
   script:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
     - curl -L "https://github.com/docker/compose/releases/download/1.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
@@ -591,7 +544,7 @@ letsencrypt-test:
       artifacts: false
 
 RAT:
-  stage: trigger-qa
+  stage: qa
   variables:
     PACKAGE_URL: ${RAT_PACKAGE_URL}
     REFERENCE_ARCHITECTURE: ${RAT_REFERENCE_ARCHITECTURE}
@@ -627,7 +580,7 @@ RAT:FIPS:
       artifacts: true
 
 GET:Geo:
-  stage: trigger-qa
+  stage: qa
   variables:
     ENVIRONMENT_ACTION: 'tmp-env'
     QA_IMAGE: ${QA_IMAGE}
@@ -731,7 +684,7 @@ pages:
   ee: ${ee}
 
 build-package-on-all-os:
-  stage: trigger-package
+  stage: package
   needs:
     - job: generate-facts
       artifacts: true