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

Roll forward "Run Travis tests in Docker (#1830)" #1838

Merged
merged 3 commits into from May 24, 2016
Merged

Conversation

@jsha
Copy link
Contributor

@jsha jsha commented May 24, 2016

That change broke the certbot tests because it switched to a MariaDB
10.1-specific syntax. certbot/certbot#3058 changes the certbot tests to use
Boulder's docker-compose.yml, so they will get MariaDB 10.1 automatically.

jsha added 2 commits May 24, 2016
Do not merge until certbot/certbot#3058 lands.

That change broke the certbot tests because it switched to a MariaDB
10.1-specific syntax. certbot/certbot#3058 changes the certbot tests to use
Boulder's docker-compose.yml, so they will get MariaDB 10.1 automatically.
@bmw
Copy link
Contributor

@bmw bmw commented May 24, 2016

@jsha
Copy link
Contributor Author

@jsha jsha commented May 24, 2016

Thanks @bmw! @rolandshoemaker, @ccppuu, could you review this one?

@rolandshoemaker
Copy link
Contributor

@rolandshoemaker rolandshoemaker commented May 24, 2016

LGTM.

@@ -42,6 +39,8 @@ for dbenv in $DBENVS; do
if [[ ${MYSQL_CONTAINER} ]]; then
sed -e "s/'localhost'/'%'/g" < ${USERS_SQL} | \
mysql $dbconn -D $db || die "unable to add users to ${db}"
elif mysqld -V | grep "10.0"; then
mysql $dbconn -D $db < test/mariadb100_users.sql

This comment has been minimized.

@cpu

cpu May 24, 2016
Contributor

@jsha is this needed now that certbot/certbot#3058 is merged? I think mariadb100_users.sql was dropped from the PR and this will break.

This comment has been minimized.

@jsha

jsha May 24, 2016
Author Contributor

Good point, thanks. Fixed!

@cpu
Copy link
Contributor

@cpu cpu commented May 24, 2016

LGTM as of 5b6280b. 💯

@jsha jsha merged commit 71e4af4 into master May 24, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jsha jsha deleted the rollforward-docker branch May 24, 2016
jsha added a commit that referenced this pull request May 25, 2016
Commit test/boulder-tools (forgot to include them in #1838).
Mount $GOPATH as a volume in the container so that source code changes take
effect in the container without a rebuild, and build cache can make repeated
runs faster. Install rabbitmq-setup outside of the mounted-over path so it still
exists.
Remove unnecessary entries from Dockerfile's PATH and GOBIN.
@jsha jsha mentioned this pull request May 25, 2016
rolandshoemaker added a commit that referenced this pull request May 25, 2016
Commit test/boulder-tools (forgot to include them in #1838).
Mount $GOPATH as a volume in the container so that source code changes take
effect in the container without a rebuild, and build cache can make repeated
runs faster. Install rabbitmq-setup outside of the mounted-over path so it still
exists.
Remove unnecessary entries from Dockerfile's PATH and GOBIN.

#1842
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.