Backport backup/restore CI tests to 2.8 #12160
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
Remove "set -e", presuming that this fix will be merged: juju#12140
juju-qa-jenkins/jobs/ci-run/scripts/lxd-runner.sh creates the container
name as follows:
CONTAINER_NAME="ci-build-${{SHORT_GIT_COMMIT}}-${{JOB_NAME}}"
And because the job name is created directly from the juju/tests/suites
subdirectory, the job name is "backup_restore".
lxc doesn't like underscores in container names, so the run fails.
Just getting rid of the underscore in the directory name seems like the
simplest way to fix.
This commit adds "-e" to the "echo" commands to fix the tests/main.sh
output for -h and -H (list of suites). Now that we're using bash instead
of sh we need "echo -e" to interpret the backslashes.
wallyworld
approved these changes
Oct 20, 2020
tests/suites/backup/backup.sh
Outdated
| run "run_basic_backup_create" | ||
| run "run_basic_backup_restore" | ||
| ) | ||
| } |
|
|
jujubot
added a commit
that referenced
this pull request
Oct 20, 2020
#12162 To pick up these PRs: * #12144 Add extra logging to uniter operations * #12145 Merge pull request #12144 from wallyworld/extra-leadership-logging * #12094 Fix bug #1887549: Check args.AgentVersion in bootstrapCAAS * #12155 Fix deprecation warning with GHA * #12160 Backport backup/restore CI tests to 2.8
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.
I landed the backup and
juju-restoretests to develop, but Jenkins is trying to run them on 2.8 as well (where they don't exist). They should work on 2.8 so there's no reason not to add them. This PR cherry-picks them to 2.8 -- commits from two PRs #12137 and #12153.