don't skip docker SHA collection on RHEL containers

[sxa]

Fixes adoptium/temurin-build#3786 #1022

While we don't pull the container build image from an external location on RHEL/s390x, we should still collect the SHA for inclusion in the SBoM.

(Note: It gets into the SBoM via the -e parameter passed in from the pipeline when the container is started which sets BUILDIMAGESHA which is then stored in metadata/docker.txt by sbin/prepareWorkspace.sh which is read by sbin/build.sh, into buildimagesha which is then added to the SBoM by sbin/build.sh)

[github-actions]

Thank you for creating a pull request!

Please check out the information below if you have not made a pull request here before (or if you need a reminder how things work).

Code Quality and Contributing Guidelines

If you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before.

Tests

Github actions will run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

In order to run the advanced pipeline tests (executing a set of mock pipelines), it requires an admin to post run tests on this PR.
If you are not an admin, please ask for one's attention in #infrastructure on Slack or ping one here.
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,21"

[sxa]

run tests

[andrew-m-leonard]

lgtm

[eclipse-temurin-bot]

 PR TESTER RESULT 

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

[sxa]

pipeline-build-check failure seems to have been this:
Suppressed: jenkins.util.io.CompositeIOException: Unable to remove directory E:\Jenkins\workspace\temp\workspace\build\src\build\windows-x86_64-normal-server-release\jdk\gensrc\java\nio with directory contents: [E:\Jenkins\workspace\temp\workspace\build\src\build\windows-x86_64-normal-server-release\jdk\gensrc\java\nio\_the..] on build-ibmcloud-win2022-x64-1 in https://ci.adoptium.net/job/build-scripts-pr-tester/job/build-test/job/jobs/job/jdk8u/job/jdk8u-windows-x64-temurin/160/console so unrelated to this PR. @steelhead31 Did you have to remediate something similar on one of these boxes recently?

[steelhead31]

pipeline-build-check failure seems to have been this: Suppressed: jenkins.util.io.CompositeIOException: Unable to remove directory E:\Jenkins\workspace\temp\workspace\build\src\build\windows-x86_64-normal-server-release\jdk\gensrc\java\nio with directory contents: [E:\Jenkins\workspace\temp\workspace\build\src\build\windows-x86_64-normal-server-release\jdk\gensrc\java\nio\_the..] on build-ibmcloud-win2022-x64-1 in https://ci.adoptium.net/job/build-scripts-pr-tester/job/build-test/job/jobs/job/jdk8u/job/jdk8u-windows-x64-temurin/160/console so unrelated to this PR. @steelhead31 Did you have to remediate something similar on one of these boxes recently?

Yup, the workspace.../temp directory had an invalid security setting, and couldn't be deleted,  it had to be forced away. This occurred again during the recent release, but I haven't had time to have another look, and currently I cant get on to the box to investigate further. I think, that the folder is being created or modified under cygwin, and something is going awry with the ownership.

[sxa]

Yup, the workspace.../temp directory had an invalid security setting, and couldn't be deleted, it had to be forced away. This occurred again during the recent release, but I haven't had time to have another look, and currently I cant get on to the box to investigate further.

Marked offline for now.

[karianna]

@sxa remind me how to restart the pipeline-build-check?

[sxa]

run tests

[sxa]

@sxa remind me how to restart the pipeline-build-check?

It's triggered by a "run tests" comment from an authorised user like the one above (I expect you're authorised!) - it's not mandatory or run by default.

[eclipse-temurin-bot]

 PR TESTER RESULT 

✅ All pipelines passed! ✅