Skip to content

Tighten match when checking for updated pcre2

Andrew Patterson requested to merge tighten-pcre2-deps-regexp into master

What does this MR do?

Tighten the match pattern for PCRE2 in deps.yml to not include RC tags. Match pattern goes from matching: 'pcre2-(\d+).(\d+)' to matching: 'pcre2-(\d+).(\d+)$'. This will prevent RC releases from matching.

Related issues

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • MR title and description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • Latest Merge Result pipeline is green.
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow.

For GitLab team members

If you don't have access to this, the reviewer should trigger these jobs for you during the review process.

  • The manual Trigger:ee-package jobs have a green pipeline running against latest commit.
  • If config/software or config/patches directories are changed, make sure the build-package-on-all-os job within the Trigger:ee-package downstream pipeline succeeded.
  • If you are changing anything SSL related, then the Trigger:package:fips manual job within the Trigger:ee-package downstream pipeline must succeed.
  • If CI configuration is changed, the branch must be pushed to dev.gitlab.org to confirm regular branch builds aren't broken.

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes.
  • Documentation created/updated.
  • Tests added.
  • Integration tests added to GitLab QA.
  • Equivalent MR/issue for the GitLab Chart opened.
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.

Test plan

  • Run deps update when RC release exists. No updates should occur.

    $ docker run -it --rm --name deps-ci -v ~/gitlab/git/gitlab.com/omnibus-gitlab:/omnibus-gitlab registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/distribution_ci_tools:5.2.0
    # cd /tmp
    # git clone -b tighten-pcre2-deps-regexp https://gitlab.com/gitlab-org/omnibus-gitlab.git
    # curl https://deps.app/install.sh | bash -s -- -b $HOME/bin
    # $HOME/bin/deps update | grep -i pcre2
  • Make sure deps detects normal release changes.

    $ docker run -it --rm --name deps-ci -v ~/gitlab/git/gitlab.com/omnibus-gitlab:/omnibus-gitlab registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/distribution_ci_tools:5.2.0
    # cd /tmp
    # git clone -b tighten-pcre2-deps-regexp https://gitlab.com/gitlab-org/omnibus-gitlab.git
    # # Edit config/software/pcre2.rb and set version to previous release.
    # diff --git a/config/software/pcre2.rb b/config/software/pcre2.rb
    index cd1bee83c..49ab2dccf 100644
    --- a/config/software/pcre2.rb
    +++ b/config/software/pcre2.rb
    @@ -16,7 +16,7 @@
    
     name 'pcre2'
    
    -version = Gitlab::Version.new('pcre2', 'pcre2-10.42')
    +version = Gitlab::Version.new('pcre2', 'pcre2-10.41')
     default_version version.print(false)
     display_version version.print(false).delete_prefix('pcre2-')
    # $HOME/bin/deps update | grep -i pcre2
    [3b2dd78] Update PCRE2Project/pcre2 from pcre2-10.41 to pcre2-10.42
Edited by Andrew Patterson

Merge request reports