Review main Merged

88846[TASK] Make container hosts IPv4 addresses manageable with GitLab

Stefan Bürk CR +2 V +2 Easy +1 −1 updated 04/01/25, 12:16

Commit message

This change replace hardcoded hosts ipv4 override in
`Build/Scripts/runTests.sh` with a variable to allow
managing it as GitLab variable in the repository for
test execution.

Upgrading runner to podman 5 is planned and hopefully
makes this workaround obsolete, but having it in place
for quicker adjustment does not hurt as intermediate
solution.

Review

  • Code review CR +2 Done
    • Stefan Bürk +2
    • Benjamin Franzke +1
    • Garvin Hicking +1
  • Verified V +2 Done
    • Stefan Bürk +2
    • Benjamin Franzke +1
    • Garvin Hicking +1
    • core-ci +1 CI

Issues 1

Files 1

Review log 1115

  1. Stefan Bürk uploaded patch set 1 03/31/25, 08:45

  2. core-ci voted on patch set 1 V +1 03/31/25, 08:53 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/76716

  3. core-ci commented on patch set 1 03/31/25, 09:07 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/76717

  4. Benjamin Franzke commented on patch set 1 03/31/25, 09:36

    runTests.sh:639

    How about dropping all these overwrites entirely from runTests.sh and injecting one variable "CONTAINER_COMMON_PARAMS_CI" which can be set in gitlab CI instead of the individual ones: In runTests.sh ``` CONTAINER_COMMON_PARAMS="${CONTAINER_COMMON_PARAMS} ${CONTAINER_COMMON_PARAMS_CI:-}" ``` Then you can inject the list dynamically (which should make our providers happy as well) from outside via ``` declare -a custom_hosts=(repo.packagist.org github.com api.github.com codeload.github.com registry.npmjs.org) CONTAINER_COMMON_PARAMS_CI="" for host in "${custom_hosts[@]}" do ipv4=$(getent ahostsv4 "${host}" | sed -n 's/^\([0-9\.]*\) *STREAM.*/\1/p' | head -n1) CONTAINER_COMMON_PARAMS_CI="${CONTAINER_COMMON_PARAMS_CI} --add-host \"${host}:${ipv4}\"" done echo $CONTAINER_COMMON_PARAMS_CI ```
  5. Stefan Bürk marked it work in progress 03/31/25, 09:57

  6. Stefan Bürk updated the commit message in patch set 2 V +1 03/31/25, 09:57

  7. Stefan Bürk commented on patch set 2 03/31/25, 09:58

    runTests.sh:639 Reply

    Good point. Will have a look later. Thanks for the input.
  8. core-ci voted on patch set 2 V +1 03/31/25, 10:03 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/76719

  9. Stefan Bürk uploaded patch set 3 V +1 04/01/25, 08:29

  10. core-ci voted on patch set 3 V +1 04/01/25, 08:35 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/76761

  11. Stefan Bürk commented on patch set 3 04/01/25, 08:56

    runTests.sh:639 Reply

    Replaced with single variable, so complete list (or other settings) can be set from the GitLab variable.
  12. Garvin Hicking commented on patch set 3 CR +1 V +1 04/01/25, 09:07

    Nice! Hope we can somehow put this flakey ipv4 chapter to rest at some point and let the runners not choke on this, so that mid-term we can also drop the params from gitlab
  13. Benjamin Franzke voted on patch set 3 CR +1 V +1 04/01/25, 11:06

  14. Stefan Bürk voted on patch set 3 CR +2 V +2 04/01/25, 12:16

  15. Stefan Bürk merged patch set 4 04/01/25, 12:16