Revert recently introduced cache changes

What does this MR do?

Revert recently introduced cache changes

- Recent pipeline jobs failed with strange cache issues. After review of
  recent changes, it is possible that changes from trigger based jobs to
  normal pipeline jobs may have introduced hidden behavioral changes that
  polluted the build caches. This reverts those changes as an attempt
  to unblock auto deploy while the team continues to investigate.
- https://dev.gitlab.org/gitlab/omnibus-gitlab/-/jobs/19887684
- https://dev.gitlab.org/gitlab/omnibus-gitlab/-/jobs/19883123
- https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/6535645918

This reverts commit 373d38dc4f9bd4106a77b058956d1e78e2f1a721.
This reverts commit b7cb856e12ecaec3c81a7109b0fa11e47db33999.

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>

Related issues

• De-duplicate cache updating jobs in omnibus-git... (#6333 - closed) • Unassigned
• Replace trigger jobs with branch build jobs (#7187 - closed) • Balasankar 'Balu' C • 16.11

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.