-
Notifications
You must be signed in to change notification settings - Fork 7
Docker tests: Switch from puppetserver to openvoxserver (rebased) #48
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jessereynolds
wants to merge
10
commits into
OpenVoxProject:main
Choose a base branch
from
jessereynolds:docker_test
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or 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
|
Think i’ve fixed this with 35acd6f |
35acd6f
to
9fef56e
Compare
9fef56e
to
5d7f208
Compare
these were skipped during rebase so manually applied here: - add depends_on openvoxserver to several services - add health check to postgres service
from change skipped during rebase from b1a6157
5d7f208
to
2102407
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Rebasing of #8
This required five commits to be skipped. I went through each of the skipped commits and re-did the the parts of them that made sense.
skipped commits during rebase:
Going through each of the above, the following to do list results:
spec/docker-compose.yml
.github/workflows/apply.yaml
spec/docker-compose.yml
("puppet_7_node" etc)spec/fixtures/inventory/docker.yaml
spec/integration/apply_spec.rb
(it 'applies the deferred type' do, it 'with a target with no uri it uses the name as the certname' do)spec/integration/device_spec.rb
spec/integration/parallel_spec.rb
spec/lib/bolt_spec/conn.rb