Skip to content

DRY for review CI/CD variables.

Andrew Patterson requested to merge 4492-dry-for-review-jobs into master

What does this MR do?

Use references for review CI/CD variables for DRY to reduce maintenance errors. Common review variables are collected in .review_*_common_vars stanzas which are then used anchors for later jobs. Anchors are used instead of the preferred references as references do not seem to work with dictionaries that have values added later, eg.

Use:

review_specs_gke122:
  extends: .specs
  variables:
    <<: *review_gke122_common_vars
    VARIABLES_FILE: "variables/review_gke122"
    RSPEC_TAGS: type:feature

instead of:

review_specs_gke122:
  extends: .specs
  variables:
    !refence [.review_gke122_common, vars]
    VARIABLES_FILE: "variables/review_gke122"
    RSPEC_TAGS: type:feature

Expected

The expanded gilab-ci.yaml file should be functionally unchanged as we are "merely" factoring out common review variables. The expanded file will have some variable reordering and the addition of the DNS_PROVIDER variable to some jobs.

Related issues

Author checklist

See Definition of done.

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

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • When ready for review, follow the instructions in the "Reviewer Roulette" section of the Danger Bot MR comment, as per the Distribution experimental MR workflow

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added/updated
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
  • Equivalent MR/issue for Gitlab Operator project opened (see Operator documentation on impact of Charts changes)
  • 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

Closes #4492 (closed)

Edited by Jason Plum

Merge request reports