diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fd2edae6c4b093f4f2552d3ee8e2b7da5ab1c27_LmdpdGxhYi1jaS55bWw=..bdf42e64f7c1c2fd25706f18a1cef7f07a8ad9bf_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,7 +162,6 @@ - if: '$PIPELINE_TYPE =~ /_TEST_PIPELINE$/' - if: '$PIPELINE_TYPE == "GITLAB_MR_PIPELINE"' - if: '$PIPELINE_TYPE =~ /TRIGGERED_(CE|EE)_PIPELINE/' - - if: '$PIPELINE_TYPE == "DEPS_IO_VERSION_BUMP_PIPELINE"' - if: '$PIPELINE_TYPE == "DEPENDENCY_SCANNING_PIPELINE"' - if: '$PIPELINE_TYPE == "FORK_MR_PIPELINE"' - when: never diff --git a/deps.yml b/deps.yml deleted file mode 100644 index 6fd2edae6c4b093f4f2552d3ee8e2b7da5ab1c27_ZGVwcy55bWw=..0000000000000000000000000000000000000000 --- a/deps.yml +++ /dev/null @@ -1,211 +0,0 @@ -version: 3 -dependencies: -- type: git - manifest_updates: - filters: - - name: ".*acme.*" # acme-client/chef-acme - group: true - enabled: true - - name: ".*chef/.*" # Chef libs - group: true - enabled: true - - name: .* # everything else - enabled: true - settings: - gitlab_labels: - - group::distribution - - section::core platform - - devops::systems - - type::maintenance - - maintenance::dependency - - dependencies.io - - workflow::ready for review - gitlab_remove_source_branch: true - commit_message_template: |- - {{.SubjectAndBody}} - - Changelog: changed - remotes: - # acme-client - https://github.com/unixcharles/acme-client.git: - replace_in_files: - - filename: config/templates/omnibus-gitlab-gems/Gemfile - pattern: "gem 'acme-client', '(\\S+)'" - tag_prefix: 'v' - # chef-acme - https://github.com/schubergphilis/chef-acme.git: - replace_in_files: - - filename: config/software/chef-acme.rb - pattern: "version = Gitlab::Version.new\\(name, 'v(\\S+)'\\)" - tag_prefix: 'v' - # alertmanager - https://gitlab.com/gitlab-org/build/omnibus-mirror/alertmanager.git: - replace_in_files: - - filename: config/software/alertmanager.rb - pattern: "Gitlab::Version.new\\('alertmanager', '(\\S+)'\\)" - tag_prefix: 'v' - # chef - https://github.com/chef/chef.git: - replace_in_files: - - filename: config/templates/omnibus-gitlab-gems/Gemfile - pattern: "gem 'chef', '(\\S+)'" - tag_prefix: 'v' - range: '<= 18.x' - - filename: config/templates/omnibus-gitlab-gems/Gemfile - pattern: "gem 'chef-bin', '(\\S+)'" - tag_prefix: 'v' - range: '<= 18.x' - # ohai - https://github.com/chef/ohai.git: - replace_in_files: - - filename: config/templates/omnibus-gitlab-gems/Gemfile - pattern: "gem 'ohai', '(\\S+)'" - tag_prefix: 'v' - range: '<= 18.x' - # mixlib-log - https://github.com/chef/mixlib-log.git: - replace_in_files: - - filename: config/templates/omnibus-gitlab-gems/Gemfile - pattern: "gem 'mixlib-log', '(\\S+)'" - # chef-zero - https://github.com/chef/chef-zero: - replace_in_files: - - filename: config/templates/omnibus-gitlab-gems/Gemfile - pattern: "gem 'chef-zero', '(\\S+)'" - # compat_resource - https://github.com/chef-cookbooks/compat_resource.git: - replace_in_files: - - filename: config/software/compat_resource.rb - pattern: "version = Gitlab::Version.new\\('compat_resource', 'v(\\S+)'\\)" - # consul - https://github.com/hashicorp/consul.git: - replace_in_files: - - filename: config/software/consul.rb - pattern: "version = Gitlab::Version.new\\('consul', 'v(\\S+)'\\)" - range: '< 1.19.0' - - filename: files/gitlab-ctl-commands-ee/lib/consul_download.rb - pattern: "DEFAULT_VERSION = '(\\S+)'" - range: '< 1.19.0' - - filename: files/gitlab-cookbooks/consul/libraries/consul_helper.rb - pattern: "SUPPORTED_MINOR = '(\\S+)'" - tag_filter: - output_as: '$1.$2' - # go-crond - https://github.com/webdevops/go-crond.git: - replace_in_files: - - filename: config/software/go-crond.rb - pattern: "version = Gitlab::Version.new\\('go-crond', '(\\S+)'\\)" - # jemalloc - https://github.com/jemalloc/jemalloc.git: - replace_in_files: - - filename: config/software/jemalloc.rb - pattern: "version = Gitlab::Version.new\\('jemalloc', '(\\S+)'\\)" - # libpng - https://git.code.sf.net/p/libpng/code.git: - replace_in_files: - - filename: config/software/libpng.rb - pattern: "version = Gitlab::Version.new\\('libpng', 'v(\\S+)'\\)" - tag_prefix: 'v' - # logrotate - https://gitlab.com/gitlab-org/build/omnibus-mirror/logrotate.git: - replace_in_files: - - filename: config/software/logrotate.rb - pattern: "Gitlab::Version.new\\(name, '(\\S+)'\\)" - # nginx-module-vts - https://gitlab.com/gitlab-org/build/omnibus-mirror/nginx-module-vts.git: - replace_in_files: - - filename: config/software/nginx-module-vts.rb - pattern: "Gitlab::Version.new\\('nginx-module-vts', '(\\S+)'\\)" - # nginx - https://github.com/nginx/nginx.git: - replace_in_files: - - filename: config/software/nginx.rb - pattern: "Gitlab::Version.new\\('nginx', 'release-(\\S+)'\\)" - tag_prefix: 'release-' - # openssl - https://github.com/openssl/openssl.git: - replace_in_files: - - filename: config/software/openssl_1.rb - pattern: "Gitlab::Version.new\\('openssl', 'OpenSSL_1_1_(\\S+)'\\)" - tag_prefix: 'OpenSSL_1_1_' - semver: false - # remote-syslog - https://github.com/papertrail/remote_syslog.git: - replace_in_files: - - filename: config/templates/omnibus-gitlab-gems/Gemfile - pattern: "gem 'remote_syslog', '(\\S+)'" - # zlib - https://github.com/madler/zlib.git: - replace_in_files: - - filename: config/software/zlib.rb - pattern: "Gitlab::Version.new\\('zlib', 'v(\\S+)'\\)" - tag_prefix: 'v' - # gitlab-exporter - https://gitlab.com/gitlab-org/gitlab-exporter.git: - replace_in_files: - - filename: config/software/gitlab-exporter.rb - pattern: "default_version '(\\S+)'" - # node-exporter - https://gitlab.com/gitlab-org/build/omnibus-mirror/node_exporter.git: - replace_in_files: - - filename: config/software/node-exporter.rb - pattern: "Gitlab::Version.new\\('node-exporter', '(\\S+)'\\)" - tag_prefix: 'v' - # postgres-exporter - https://gitlab.com/gitlab-org/build/omnibus-mirror/postgres_exporter.git: - replace_in_files: - - filename: config/software/postgres-exporter.rb - pattern: "Gitlab::Version.new\\('postgres-exporter', '(\\S+)'\\)" - tag_prefix: 'v' - # redis-exporter - https://gitlab.com/gitlab-org/build/omnibus-mirror/redis_exporter.git: - replace_in_files: - - filename: config/software/redis-exporter.rb - pattern: "Gitlab::Version.new\\('redis-exporter', '(\\S+)'\\)" - tag_prefix: 'v' - #libjpeg-turbo - https://github.com/libjpeg-turbo/libjpeg-turbo.git: - replace_in_files: - - filename: config/software/libjpeg-turbo.rb - pattern: "Gitlab::Version.new\\('libjpeg-turbo', '(\\S+)'\\)" - range: '< 2.1.90' - #libtiff - https://gitlab.com/libtiff/libtiff.git: - replace_in_files: - - filename: config/software/libtiff.rb - pattern: "Gitlab::Version.new\\('libtiff', 'v(\\S+)'\\)" - tag_prefix: 'v' - # redis - https://github.com/redis/redis.git: - replace_in_files: - - filename: config/software/redis.rb - pattern: "Gitlab::Version.new\\('redis', '(\\S+)'\\)" - range: '< 7.2.0' - # pcre2 - https://github.com/PCRE2Project/pcre2.git: - replace_in_files: - - filename: config/software/pcre2.rb - pattern: "Gitlab::Version.new\\('pcre2', '(\\S+)'\\)" - tag_filter: - matching: 'pcre2-(\d+).(\d+)$' - sort_as: '$1.$2.0' - # deps that need updated filtering to work https://github.com/dropseed/deps-git/issues/2 - # krb5 - # https://github.com/krb5/krb5.git: - # replace_in_files: - # - filename: config/software/krb5.rb - # pattern: "Gitlab::Version.new\\('krb5', 'krb5-(\\S+)'\\)" - # tag_prefix: 'krb5-' - # libevent - # https://github.com/libevent/libevent.git: - # replace_in_files: - # - filename: config/software/libevent.rb - # pattern: "version = Gitlab::Version.new\\('libevent', '(release-\\d+\\.\\d+\\.\\d+-stable)'\\)" - # semver: false - # libicu - # https://github.com/unicode-org/icu.git: - # replace_in_files: - # - filename: config/software/libicu.rb - # pattern: "version = Gitlab::Version.new\\('libicu', 'release-(\\d+-\\d+)'\\)" - # tag_prefix: 'release-' - # semver: false diff --git a/doc/development/ci-variables.md b/doc/development/ci-variables.md index 6fd2edae6c4b093f4f2552d3ee8e2b7da5ab1c27_ZG9jL2RldmVsb3BtZW50L2NpLXZhcmlhYmxlcy5tZA==..bdf42e64f7c1c2fd25706f18a1cef7f07a8ad9bf_ZG9jL2RldmVsb3BtZW50L2NpLXZhcmlhYmxlcy5tZA== 100644 --- a/doc/development/ci-variables.md +++ b/doc/development/ci-variables.md @@ -63,8 +63,6 @@ | `OMNIBUS_GITLAB_MIRROR_PROJECT_ACCESS_TOKEN` | Project access token for building a test package. | | `CI_SLACK_WEBHOOK_URL` | Webhook URL for Slack failure notifications. | | `DANGER_GITLAB_API_TOKEN` | GitLab API token for dangerbot to post comments to MRs. | -| `DEPS_GITLAB_TOKEN` | Token used by [dependencies.io](https://www.dependencies.io/gitlab/) to create MRs. | -| `DEPS_TOKEN` | Token used by CI to auth to [dependencies.io](https://www.dependencies.io/gitlab/). | | `DOCS_API_TOKEN` | Token used by CI to trigger a review-app build of the docs site. | | `MANUAL_QA_TEST` | Variable used to decide if the `qa-subset-test` job should be played automatically or not. | diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index 6fd2edae6c4b093f4f2552d3ee8e2b7da5ab1c27_ZG9jL2RldmVsb3BtZW50L3BpcGVsaW5lcy5tZA==..bdf42e64f7c1c2fd25706f18a1cef7f07a8ad9bf_ZG9jL2RldmVsb3BtZW50L3BpcGVsaW5lcy5tZA== 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -96,8 +96,6 @@ | Pipeline type | Mirror(s) where the pipeline runs | Remarks | | -------------------------------- | --------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | | `DEPENDENCY_SCANNING_PIPELINE` | Canonical | Check for security vulnerabilities in dependencies. Requires `DEPENDENCY_SCANNING` variable to be set to `true`. | -| `DEPS_IO_VERSION_BUMP_PIPELINE` | Canonical | On branch pushes done by `deps.io`. Requires branches to have `deps-` prefix. | -| `DEPS_IO_VERSION_CHECK_PIPELINE` | Canonical | Run `deps` to detect updates. Requires `DEPS_PIPELINE` variable to be set to `true`. | | `LICENSE_PAGE_UPDATE_PIPELINE` | Canonical | Update license pages. Requires `PAGES_UPDATE` variable to be set to `true`. | | `CACHE_UPDATE_PIPELINE` | Canonical, QA | Update the gem cache and package build cache. Requires `CACHE_UPDATE` variable to be set to `true`. | | `DURATION_PLOTTER_PIPELINE` | QA | Package build to plot duration of builds. Requires `DURATION_PLOTTER` variable to be set to `true`. | @@ -137,5 +135,5 @@ ### Scheduled pipelines -In [Development repository](https://gitlab.com/gitlab-org/omnibus-gitlab), there are two scheduled pipelines. +In [Development repository](https://gitlab.com/gitlab-org/omnibus-gitlab), there is one scheduled pipeline. @@ -141,6 +139,4 @@ -1. `Dependencies Update` - Pipeline to check for outdated dependencies using the - [`dependency_update`](#dependency_update) job. 1. `Generate license pages` - Pipeline to populate [License collection webpage](https://gitlab-org.gitlab.io/omnibus-gitlab/licenses.html) with license information from the S3 bucket. @@ -144,10 +140,10 @@ 1. `Generate license pages` - Pipeline to populate [License collection webpage](https://gitlab-org.gitlab.io/omnibus-gitlab/licenses.html) with license information from the S3 bucket. -In [Release mirror](https://dev.gitlab.org/gitlab/omnibus-gitlab), there are two scheduled pipelines +In [Release mirror](https://dev.gitlab.org/gitlab/omnibus-gitlab), there are two scheduled pipelines. 1. `CE nightly` - Pipeline to build nightly packages and Docker images for GitLab CE 1. `EE nightly` - Pipeline to build nightly packages and Docker images for GitLab EE @@ -148,10 +144,10 @@ 1. `CE nightly` - Pipeline to build nightly packages and Docker images for GitLab CE 1. `EE nightly` - Pipeline to build nightly packages and Docker images for GitLab EE -Other mirrors doesn't have any scheduled pipelines +Other mirrors doesn't have any scheduled pipelines. ### Auto-deploy pipelines @@ -491,24 +487,6 @@ These caches are updated in scheduled pipelines by `update-gems-cache` and `update-trigger-package-cache` jobs respectively, when the `CACHE_UPDATE` exists. -### `dependency_update` - -This job makes use of Dependencies.io to automatically check for version updates -of various components that we include in our package and open merge request -against [Development repository](https://gitlab.com/gitlab-org/omnibus-gitlab) if an update is found. - -This job is run only on [Development repository](https://gitlab.com/gitlab-org/omnibus-gitlab), on scheduled pipelines when -`DEPS_PIPELINE` variable exists. - -### `dependencies_io_check` - -This job automatically triggers a e2e:test-on-omnibus pipeline in [QA mirror](https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror), -(similar to `Trigger:ce-package` job), when a merge request is made by -`dependency_update` job. - -This job is run only on [Development repository](https://gitlab.com/gitlab-org/omnibus-gitlab) when the branch name starts with -`deps` (this is the format that `dependency_update` job uses for merge requests) - ### `valdiate_packer_changes` This job checks if the packer configuration files: `https://dev.gitlab.org/gitlab/omnibus-gitlab/-/tree/master/support/packer` are valid or not. @@ -522,6 +500,4 @@ containing license information of various components included in the package for each release of GitLab. -This job is run only on [Development repository](https://gitlab.com/gitlab-org/omnibus-gitlab) and on scheduled pipelines which -does not have the `DEPS_PIPELINE` variable (to differentiate it from -`dependency_update` runs). +This job is run only on [Development repository](https://gitlab.com/gitlab-org/omnibus-gitlab). diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml index 6fd2edae6c4b093f4f2552d3ee8e2b7da5ab1c27_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA==..bdf42e64f7c1c2fd25706f18a1cef7f07a8ad9bf_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA== 100644 --- a/gitlab-ci-config/gitlab-com.yml +++ b/gitlab-ci-config/gitlab-com.yml @@ -222,8 +222,6 @@ - if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/' when: manual variables: !reference [.ee-trigger-job-variables] - - if: '$PIPELINE_TYPE == "DEPS_IO_VERSION_BUMP_PIPELINE"' - variables: !reference [.ee-trigger-job-variables] rubocop: extends: .gems-cache @@ -588,16 +586,6 @@ paths: - dependency_report.txt -dependency_update: - image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}" - stage: prepare - before_script: [] - script: - - curl https://deps.app/install.sh | bash -s -- -b $HOME/bin - - $HOME/bin/deps ci - rules: - - if: '$PIPELINE_TYPE == "DEPS_IO_VERSION_CHECK_PIPELINE"' - validate_renovate_checksum: image: docker.io/bash:5.2-alpine3.20 stage: prepare diff --git a/gitlab-ci-config/workflow-rules.yml b/gitlab-ci-config/workflow-rules.yml index 6fd2edae6c4b093f4f2552d3ee8e2b7da5ab1c27_Z2l0bGFiLWNpLWNvbmZpZy93b3JrZmxvdy1ydWxlcy55bWw=..bdf42e64f7c1c2fd25706f18a1cef7f07a8ad9bf_Z2l0bGFiLWNpLWNvbmZpZy93b3JrZmxvdy1ydWxlcy55bWw= 100644 --- a/gitlab-ci-config/workflow-rules.yml +++ b/gitlab-ci-config/workflow-rules.yml @@ -18,9 +18,6 @@ - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $CANONICAL_PROJECT_PATH && $DEPENDENCY_SCANNING == "true" && $CI_PIPELINE_SOURCE == "schedule"' variables: PIPELINE_TYPE: DEPENDENCY_SCANNING_PIPELINE - - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $CANONICAL_PROJECT_PATH && $DEPS_PIPELINE == "true"' - variables: - PIPELINE_TYPE: DEPS_IO_VERSION_CHECK_PIPELINE - if: '$PIPELINE_TYPE == null && $CACHE_UPDATE == "true" && $CI_PIPELINE_SOURCE == "schedule"' variables: PIPELINE_TYPE: CACHE_UPDATE_PIPELINE @@ -38,9 +35,6 @@ - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $QA_PROJECT_PATH && $DURATION_PLOTTER == "true" && $CI_PIPELINE_SOURCE == "schedule"' variables: PIPELINE_TYPE: DURATION_PLOTTER_PIPELINE - - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $CANONICAL_PROJECT_PATH && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^deps/' - variables: - PIPELINE_TYPE: DEPS_IO_VERSION_BUMP_PIPELINE - if: '$PIPELINE_TYPE == null && $CI_PROJECT_PATH == $CANONICAL_PROJECT_PATH && ($CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^docs-/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /-docs$/)' variables: PIPELINE_TYPE: DOCS_PIPELINE