-
Notifications
You must be signed in to change notification settings - Fork 360
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
Updated run.sh to pass in the mysql key & trust stores. #85
Conversation
Tex-- assuming liquibase has been successfully run in the past, this |
2a47501
to
0df08fd
Compare
f259188
to
dfaf501
Compare
So... what exactly was not working before? |
/** | ||
* Returns the value of either the "url" or "properties.url" | ||
*/ | ||
def urlValue = config.getString(urlKey) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why would we expect one or the other?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When using HikariCP, the default Slick 3.0.0 connection pool, with the newer javax.sql.DataSource
, the urlKey
is properties.url
. For other combinations, the key is url
.
The following additional keys are supported for HikariCP only:
• dataSourceClass (String, optional): ... Note that url is ignored when this key is set (You have to use properties to configure the database connection instead).
…
Not 100% sure what wasn't working at what point. I suspect that based on the order of the original commits1, the By the time I was running "11." earlier today, the configuration
I did add another variable in "11." by always testing with Meanwhile, all test combinations of setting ssl worked for both slick and raw datasource connections, in tests via the url (Ssl), or via the dataSource properties (*Prop). So I think just setting back the 1 What I believe is the previous order of the commits:
|
Also updated jenkins with file that appears in the dev /etc/cromwell.conf.
Fixed minor typo in copypasta test label.
dfaf501
to
7ce675b
Compare
Received a verbal tentative 👍 from @mcovarr (I will follow up with more inline docs regarding conversation above) and 👍 from @coreone with his latest This jenkins build may break in develop due to server-conf-file logic required from #102, but we believe it should all work once that's merged in too. Merging. |
Updated run.sh to pass in the mysql key & trust stores.
* Fix stackoverflow if a test fails * PR comment
Also updated jenkins with file that appears in the dev /etc/cromwell.conf.