[lint-gitlab-refacto] Removed rules

DataDog · Oct 10, 2024 · 5cc7734 · 5cc7734
1 parent a03c1c5
commit 5cc7734
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/.gitlab/.ci-linters.yml b/.gitlab/.ci-linters.yml
@@ -16,6 +16,7 @@ needs-rules:
     - build_processed_btfhub_archive
     - check_already_deployed_version_7
     - cleanup_kitchen_functional_test
+    - compute_gitlab_ci_config
     - deploy_containers-cws-instrumentation-final-versioned
     - deploy_containers-cws-instrumentation-latest
     - deploy_containers-cws-instrumentation-rc-mutable
@@ -26,6 +27,8 @@ needs-rules:
     - lint_flavor_dogstatsd_linux-x64
     - lint_flavor_heroku_linux-x64
     - lint_flavor_iot_linux-x64
+    - lint_gitlab_ci
+    - lint_gitlab_ci_jobs_codeowners
     - lint_linux-arm64
     - lint_linux-x64
     - lint_macos_gitlab_amd64

diff --git a/.gitlab/.pre/gitlab_configuration.yml b/.gitlab/.pre/gitlab_configuration.yml
@@ -25,19 +25,12 @@ test_gitlab_compare_to:
     - pip install -r tasks/requirements.txt
     - inv pipeline.compare-to-itself
 
-.compute_gitlab_ci_config_rules:
-  - if: $CI_PIPELINE_SOURCE != "push"
-    when: never
-
 # Computes and uploads the GitLab CI configuration diff as an artifact
 compute_gitlab_ci_config:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   stage: .pre
   needs: []
   tags: ["arch:arm64"]
-  rules:
-  - !reference [.compute_gitlab_ci_config_rules]
-  - when: on_success
   before_script:
     # Get main history
     - git fetch origin main
@@ -58,9 +51,6 @@ lint_gitlab_ci:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: [compute_gitlab_ci_config]
-  rules:
-    - !reference [.compute_gitlab_ci_config_rules]
-    - !reference [.on_gitlab_changes_or_mergequeue_or_main]
   script:
     - inv -e linter.gitlab-ci-jobs-needs-rules --config-file artifacts/after.gitlab-ci.yml
     - inv -e linter.gitlab-ci-jobs-owners --config-file artifacts/after.gitlab-ci.yml
@@ -70,7 +60,5 @@ lint_gitlab_ci_jobs_codeowners:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:arm64"]
   needs: []
-  rules:
-    - !reference [.on_gitlab_changes]
   script:
     - inv -e linter.gitlab-ci-jobs-codeowners --all-files
diff --git a/.gitlab/notify/notify.yml b/.gitlab/notify/notify.yml
@@ -95,7 +95,6 @@ notify_gitlab_ci_changes:
   needs: [compute_gitlab_ci_config]
   tags: ["arch:amd64"]
   rules:
-    - !reference [.compute_gitlab_ci_config_rules]
     - changes:
         paths:
           - .gitlab-ci.yml