Review main Merged

83515[TASK] Apply some runTests.sh cleanups

Benjamin Franzke CR +2 V +2 Easy +25 −7 updated 03/19/24, 13:16

Commit message

* Always clean-up containers when Control-C is pressed
 * Enforce removing networks even if some containers have not been
   fully stopped (does not work with older docker versions, therefore
   only enabled for podman)
 * Bail out if `waitFor` failed instead of resuming with subsequent
   commands
 * Avoid waiting unnecessarily for VNC-web port 7900 in headless mode
 * Do not derive `--pull=never` from the `$CI` environment variable, as
   `$CI` is set both in gitlab [1] and github [2] actions.
   runTests.sh might be used in github actions, therefore this flag is
   moved into our gitlab-ci specific configuration.
 * Fix typos

[1] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
[2] https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables

Review

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

Issues 1

Files 2

Review log 810

  1. Benjamin Franzke uploaded patch set 1 03/19/24, 09:05

  2. core-ci voted on patch set 1 V +1 03/19/24, 09:11 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54678

  3. Benjamin Franzke uploaded patch set 2 V +1 03/19/24, 10:48

  4. core-ci voted on patch set 2 V +1 03/19/24, 10:54 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54684

  5. Christian Kuhn voted on patch set 2 CR +1 V +1 03/19/24, 11:09

  6. Christian Kuhn commented on patch set 2 03/19/24, 11:45

    runTests.sh:7

    this probably needs a test with osx: trap may not be supported with default bash on mac?
  7. Benjamin Franzke commented on patch set 2 03/19/24, 13:08

    runTests.sh:7 Reply

    yup, @a.fernandez@scripting-base.de tested this on macos with bash v3.2: Changing port in waitFor from `4444` to `4445` successfully aborted the script and returned the configured exit code in trap: ``` ❯ Build/Scripts/runTests.sh -b docker -s acceptance Can not connect to chrome port 4445. Aborting. ❯ echo "EXIT code was: $?" EXIT code was: 2 ```
  8. Stefan Bürk voted on patch set 2 CR +1 V +1 03/19/24, 13:13

  9. Benjamin Franzke voted on patch set 2 CR +2 V +2 03/19/24, 13:16

  10. Benjamin Franzke merged patch set 3 03/19/24, 13:16