Fix NGINX modules not always building with the right tag
What does this MR do?
If the Omnibus build cache were present, previously the
ngx_security_headers and nginx-module-vts components would often
be built with master instead of tagged versions. This happened
because Omnibus' GitFetcher clones the repositories and only checks
out the specific version when building the component. The nginx
component assumes that the Omnibus source cache has the right version,
but if nothing changed with ngx_security_headers and
nginx-module-vts then the git checkout will not occur.
To avoid this trouble with GitFetcher, we need to do several things:
-
Copy the extracted source into a subdirectory into
/opt/gitlab/src/nginx_modules. -
Point NGINX to these installed directories.
-
Exclude the
/opt/gitlab/srcfrom the final package.
The Omnibus build cache will cache the contents of /opt/gitlab/src
in Git, and so the right versions should always be used.
Relates to #9066 (closed)
Changelog: fixed
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 workflowready 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-packagejobs have a green pipeline running against latest commit. -
If config/softwareorconfig/patchesdirectories are changed, make sure thebuild-package-on-all-osjob within theTrigger:ee-packagedownstream pipeline succeeded. -
If you are changing anything SSL related, then the Trigger:package:fipsmanual job within theTrigger:ee-packagedownstream pipeline must succeed. -
If CI configuration is changed, the branch must be pushed to dev.gitlab.orgto 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, duration10s, URIscheme://user:passwd@host:portmay require quotation or other special handling when rendered in a template and written to a configuration file.