Skip to content
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

[2.9] Fix broken centos proxy tests part2 #12755

Merged

Conversation

achilleasa
Copy link
Contributor

This PR skips a few additional tests (windows/centos) that were missed by the changeset in #12746.

Copy link
Member

@hmlanigan hmlanigan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, checked against failing tests in centos unit tests

@achilleasa
Copy link
Contributor Author

$$merge$$

@jujubot jujubot merged commit 73485f4 into juju:2.9 Mar 11, 2021
@achilleasa achilleasa deleted the 2.9-fix-broken-centos-proxy-tests-part2 branch March 11, 2021 15:07
@wallyworld wallyworld mentioned this pull request Mar 16, 2021
jujubot added a commit that referenced this pull request Mar 16, 2021
#12770

Merge 2.9

#12735 Silences proxy log messages from klog
#12742 Fixes broken kubeconfig loading tests
#12754 Record hostname when machine agent starts
#12755 Fix broken centos proxy tests part2
#12756 Update github.com/juju/charm/v7 to include v2 block
#12757 Disable tests/run.sh for released bundle test and dump logs
#12739 Scaffold upgrade series logic 
#12753 Disregard refcount for blobstore cleanup
#12758 No panic missing bundle app body
#12759 Fix errant relative timeout for migration minion reports
#12760 Include hostname in multi-watcher machine deltas
#12750 Refactor series support to that juju itself can set its own supported series


```
# Conflicts:
# apiserver/allfacades.go
# apiserver/facades/agent/machine/machiner.go
# apiserver/facades/client/client/client.go
# apiserver/facades/schema.json
# caas/kubernetes/provider/cloud.go
# cloudconfig/userdatacfg_unix.go
# cmd/juju/commands/bootstrap_test.go
# state/migration_internal_test.go
```

## QA steps

See PRs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants