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.

Sign up for GitHub

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

Jump to bottom

Update the SyTest docker images to ones that work on Buildkite #639

Merged
merged 6 commits into from
Jul 12, 2019
Merged

Update the SyTest docker images to ones that work on Buildkite #639

merged 6 commits into from
Jul 12, 2019

Conversation

hawkowl
Copy link
Contributor

@hawkowl hawkowl commented Jul 4, 2019

No description provided.

@hawkowl hawkowl requested a review from a team July 4, 2019 14:49
@hawkowl hawkowl self-assigned this Jul 4, 2019
@hawkowl hawkowl requested a review from a team July 4, 2019 15:31
@richvdh
Copy link
Member

richvdh commented Jul 4, 2019

what's the background here? why don't they currently work on buildkite? Are we not currently using them on buildkite?

@hawkowl
Copy link
Contributor Author

hawkowl commented Jul 5, 2019

@richvdh when I first got it working, I vendored in a buildkite-specific build_synapse.sh. This upstreams that, and fixes some issues (like us using entrypoints instead of cmd which makes it harder for the BK plugin to use).

These are the current images being used on buildkite.

richvdh
richvdh approved these changes Jul 5, 2019
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

looks good other than the below

docker/synapse_sytest.sh Outdated
@@ -5,6 +5,13 @@

set -ex

if [ -n "$BUILDKITE" ]
then
SYNAPSE_DIR=`pwd`
Copy link
Member

Choose a reason for hiding this comment

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

could we not set workdir in the buildkite config (https://github.com/buildkite-plugins/docker-buildkite-plugin#workdiroptional-string) which would solve this and make the readme (which says: mount the server to be tested at /src) more truthful?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

see matrix-org/synapse#5664

Copy link
Member

Choose a reason for hiding this comment

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

so we can get rid of this condition now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes

@hawkowl hawkowl mentioned this pull request Jul 11, 2019
Merged
@hawkowl hawkowl merged commit 7d52124 into develop Jul 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anoadragon453 anoadragon453 anoadragon453 left review comments

@richvdh richvdh richvdh approved these changes

Assignees

@hawkowl hawkowl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hawkowl @richvdh @anoadragon453