fix: broken authorized keys bootstrap test #18400
Merged
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
Aflynn50
reviewed
Nov 21, 2024
| @@ -28,10 +28,11 @@ run_bootstrap_authorized_keys_loaded() { | |||
| ssh-keygen -t ed25519 -f "$extra_key_file" -C "[email protected]" -P "" | |||
|
|
|||
| HOME="${SUB_TEST_DIR}" | |||
| JUJU_DATA="${juju_home_dir}" | |||
There was a problem hiding this comment.
Are you sure this works? This variable is not actually being exported here, just set locally. I don't think the juju cli would be aware of it.
There was a problem hiding this comment.
Hence the shell check error:
| In tests/suites/authorized_keys/bootstrap.sh line 77:
| JUJU_DATA="${juju_home_dir}"
| ^-------^ SC2034 (warning): JUJU_DATA appears unused. Verify use (or export if used externally).
| bootstrap_additional_args=(--config "'authorized-keys=$(cat ${extra_key_file_pub})'") | ||
| export BOOTSTRAP_ADDITIONAL_ARGS="${bootstrap_additional_args[*]}" | ||
| export BOOTSTRAP_REUSE=false | ||
| bootstrap "authorized-keys-default" "$log_file" | ||
| bootstrap "authorized-keys-loaded" "$log_file" |
There was a problem hiding this comment.
Why change the controller name?
There was a problem hiding this comment.
It was wrong and causing another issue. It should reflect the name of the test. Just a bad copy and paste i fixed as a drive by.
tlm
force-pushed
the
authorized-key-tests-failures
branch
from
2674b57
to
9b08995
Compare
|
/build |
hpidcock
approved these changes
Nov 25, 2024
wallyworld
approved these changes
Nov 25, 2024
tlm
force-pushed
the
authorized-key-tests-failures
branch
from
d281894
to
c28c2c7
Compare
This commit fixes broken authorized keys test for bootstrap. It has been a problem that the authorized_keys bootstrap tests have been failing in our CI environment and not on local machines when testing. The reason for this failaure is due to our CI environment having set the JUJU_DATA env variable. This set of tests needs to be able to hijack the Juju home data directory to establish a controlled environment. Because the CI system had this env set Juju was using the wrong directory for it's data. The fix is to make sure that we set this variable for the duration of the test to the value we want.
tlm
force-pushed
the
authorized-key-tests-failures
branch
from
c28c2c7
to
9b1268f
Compare
|
/build |
|
/merge |
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.
This commit fixes broken authorized keys test for bootstrap. It has been a problem that the authorized_keys bootstrap tests have been failing in our CI environment and not on local machines when testing.
The reason for this failaure is due to our CI environment having set the JUJU_DATA env variable. This set of tests needs to be able to hijack the Juju home data directory to establish a controlled environment.
Because the CI system had this env set Juju was using the wrong directory for it's data. The fix is to make sure that we set this variable for the duration of the test to the value we want.
Checklist
[] Go unit tests, with comments saying what you're testing[ ] Integration tests, with comments saying what you're testing[ ] doc.go added or updated in changed packagesQA steps
We can confirm this fix with the following steps:
JUJU_DATA=foobar ./main.sh -v authorized_keys test_bootstrap_authorized_keysIf the tests run successfully then everything is resolved.
Documentation changes
Jira card: JUJU-6889