Skip to content

Add missing HA config keys (#3776)#3814

Merged
DaanHoogland merged 3 commits into
masterfrom
ha-config-to-master
Jan 15, 2020
Merged

Add missing HA config keys (#3776)#3814
DaanHoogland merged 3 commits into
masterfrom
ha-config-to-master

Conversation

@DaanHoogland
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland commented Jan 14, 2020

Description

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

@svenvogel
Copy link
Copy Markdown
Contributor

@DaanHoogland how it looks like?

@DaanHoogland
Copy link
Copy Markdown
Contributor Author

@svenvogel it passed all tests on 4.13. it had merge conflict so i'll run tests again here.
@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✖centos6 ✖centos7 ✖debian. JID-596

@DaanHoogland
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-599

@DaanHoogland
Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link
Copy Markdown

Trillian test result (tid-771)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29028 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3814-t771-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 78 look OK, 0 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File

@DaanHoogland
Copy link
Copy Markdown
Contributor Author

@andrijapanicsb this is forward merged from the 4.13 branch and had LGTMs and tests. It had merge conflicts however but all looks fine now. merge?

@andrijapanicsb
Copy link
Copy Markdown
Contributor

You know your stuff @DaanHoogland - so if you are happy, yes.

@DaanHoogland DaanHoogland changed the title Add missing HA config keys (#3776) Add missing HA config keys (#3776) Jan 15, 2020
@DaanHoogland DaanHoogland merged commit 4780a27 into master Jan 15, 2020
@DaanHoogland DaanHoogland deleted the ha-config-to-master branch January 15, 2020 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants