run-local.sh: Various cleanups, prepare for job-runner #589
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With job-runner, the repo will be cloned in a pristine environment. git will be rather unhappy to try and clone the "123abc" mock SHA.
curl an existing URL, to avoid printing the 404 page on success -- that's confusing when looking at the log.
This prepares us for testing job-runner, where the mock git command needs to be installed into the job container as well. Also write the log into a test attachment instead of /work. That way, we can access it regardless of where it ran.
When we'll move to job-runner, then `image-create` will not run in the cockpituous-tasks container any more. So instead of assuming that the image is already in /cache/images, download it from S3 instead.
5 tasks
allisonkarlitskaya
approved these changes
Mar 7, 2024
| export GITHUB_API=http://127.0.0.7:8443 | ||
| until curl --silent \$GITHUB_API; do sleep 0.1; done | ||
| export GITHUB_API=$GHAPI_URL_POD | ||
| until curl --silent --fail \$GITHUB_API/repos/cockpit-project/bots; do sleep 0.1; done |
There was a problem hiding this comment.
I almost commented here that hardcoding this was bad, for example, but that's obviously non-sense in this case.
Sometimes I think it would be better to have named this repository something different. I always get confused about things on the real GitHub (which should allow for generalization based on which fork is running the tests) vs. our mocked-up stuff.
This is officially a drive-by.
| echo "$@" >> "${TEST_ATTACHMENTS}/git-push.log" | ||
| exit 0 | ||
| fi | ||
| exec /usr/bin/git "$@" |
There was a problem hiding this comment.
I'm not crazy about this, but it's probably the best option for the time being...
In a certain sense, this is mocking in its purest form...
| @@ -46,7 +46,7 @@ jobs: | |||
| - name: Check which containers changed | |||
| id: containers_changed | |||
| run: | | |||
| tasks=$(git diff --name-only origin/main..HEAD -- tasks/ | grep -Ev 'run-local.sh|openssl.cnf|README|mock-github|.yaml' || true) | |||
| tasks=$(git diff --name-only origin/main..HEAD -- tasks/ | grep -Ev 'run-local.sh|openssl.cnf|README|mock-|.yaml' || true) | |||
There was a problem hiding this comment.
This is starting to beg for a separate tasks/container/ directory...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Broken out of #586 -- these parts apply to the current infra. I re-triggered cockpit-project/bots#6017 and it is green now 💚 .