mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 19:40:20 +00:00
Merge pull request #4041 from matrix-org/rav/run_tests_in_docker
run the circle builds in docker containers
This commit is contained in:
commit
80736fd8ed
3 changed files with 51 additions and 43 deletions
|
@ -23,99 +23,106 @@ jobs:
|
||||||
- run: docker push matrixdotorg/synapse:latest
|
- run: docker push matrixdotorg/synapse:latest
|
||||||
- run: docker push matrixdotorg/synapse:latest-py3
|
- run: docker push matrixdotorg/synapse:latest-py3
|
||||||
sytestpy2:
|
sytestpy2:
|
||||||
machine: true
|
docker:
|
||||||
|
- image: matrixdotorg/sytest-synapsepy2
|
||||||
|
working_directory: /src
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy2
|
- run: /synapse_sytest.sh
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs matrixdotorg/sytest-synapsepy2
|
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: /logs
|
||||||
destination: logs
|
destination: logs
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: logs
|
path: /logs
|
||||||
sytestpy2postgres:
|
sytestpy2postgres:
|
||||||
machine: true
|
docker:
|
||||||
|
- image: matrixdotorg/sytest-synapsepy2
|
||||||
|
working_directory: /src
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy2
|
- run: POSTGRES=1 /synapse_sytest.sh
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs -e POSTGRES=1 matrixdotorg/sytest-synapsepy2
|
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: /logs
|
||||||
destination: logs
|
destination: logs
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: logs
|
path: /logs
|
||||||
sytestpy2merged:
|
sytestpy2merged:
|
||||||
machine: true
|
docker:
|
||||||
|
- image: matrixdotorg/sytest-synapsepy2
|
||||||
|
working_directory: /src
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: bash .circleci/merge_base_branch.sh
|
- run: bash .circleci/merge_base_branch.sh
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy2
|
- run: /synapse_sytest.sh
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs matrixdotorg/sytest-synapsepy2
|
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: /logs
|
||||||
destination: logs
|
destination: logs
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: logs
|
path: /logs
|
||||||
|
|
||||||
sytestpy2postgresmerged:
|
sytestpy2postgresmerged:
|
||||||
machine: true
|
docker:
|
||||||
|
- image: matrixdotorg/sytest-synapsepy2
|
||||||
|
working_directory: /src
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: bash .circleci/merge_base_branch.sh
|
- run: bash .circleci/merge_base_branch.sh
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy2
|
- run: POSTGRES=1 /synapse_sytest.sh
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs -e POSTGRES=1 matrixdotorg/sytest-synapsepy2
|
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: /logs
|
||||||
destination: logs
|
destination: logs
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: logs
|
path: /logs
|
||||||
|
|
||||||
sytestpy3:
|
sytestpy3:
|
||||||
machine: true
|
docker:
|
||||||
|
- image: matrixdotorg/sytest-synapsepy3
|
||||||
|
working_directory: /src
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy3
|
- run: /synapse_sytest.sh
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs matrixdotorg/sytest-synapsepy3
|
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: /logs
|
||||||
destination: logs
|
destination: logs
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: logs
|
path: /logs
|
||||||
sytestpy3postgres:
|
sytestpy3postgres:
|
||||||
machine: true
|
docker:
|
||||||
|
- image: matrixdotorg/sytest-synapsepy3
|
||||||
|
working_directory: /src
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy3
|
- run: POSTGRES=1 /synapse_sytest.sh
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs -e POSTGRES=1 matrixdotorg/sytest-synapsepy3
|
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: /logs
|
||||||
destination: logs
|
destination: logs
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: logs
|
path: /logs
|
||||||
sytestpy3merged:
|
sytestpy3merged:
|
||||||
machine: true
|
docker:
|
||||||
|
- image: matrixdotorg/sytest-synapsepy3
|
||||||
|
working_directory: /src
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: bash .circleci/merge_base_branch.sh
|
- run: bash .circleci/merge_base_branch.sh
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy3
|
- run: /synapse_sytest.sh
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs matrixdotorg/sytest-synapsepy3
|
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: /logs
|
||||||
destination: logs
|
destination: logs
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: logs
|
path: /logs
|
||||||
sytestpy3postgresmerged:
|
sytestpy3postgresmerged:
|
||||||
machine: true
|
docker:
|
||||||
|
- image: matrixdotorg/sytest-synapsepy3
|
||||||
|
working_directory: /src
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: bash .circleci/merge_base_branch.sh
|
- run: bash .circleci/merge_base_branch.sh
|
||||||
- run: docker pull matrixdotorg/sytest-synapsepy3
|
- run: POSTGRES=1 /synapse_sytest.sh
|
||||||
- run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs -e POSTGRES=1 matrixdotorg/sytest-synapsepy3
|
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/project/logs
|
path: /logs
|
||||||
destination: logs
|
destination: logs
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: logs
|
path: /logs
|
||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
|
|
|
@ -16,7 +16,7 @@ then
|
||||||
GITBASE="develop"
|
GITBASE="develop"
|
||||||
else
|
else
|
||||||
# Get the reference, using the GitHub API
|
# Get the reference, using the GitHub API
|
||||||
GITBASE=`curl -q https://api.github.com/repos/matrix-org/synapse/pulls/${CIRCLE_PR_NUMBER} | jq -r '.base.ref'`
|
GITBASE=`wget -O- https://api.github.com/repos/matrix-org/synapse/pulls/${CIRCLE_PR_NUMBER} | jq -r '.base.ref'`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Show what we are before
|
# Show what we are before
|
||||||
|
@ -31,4 +31,4 @@ git fetch -u origin $GITBASE
|
||||||
git merge --no-edit origin/$GITBASE
|
git merge --no-edit origin/$GITBASE
|
||||||
|
|
||||||
# Show what we are after.
|
# Show what we are after.
|
||||||
git show -s
|
git show -s
|
||||||
|
|
1
changelog.d/4041.misc
Normal file
1
changelog.d/4041.misc
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Run the CircleCI builds in docker containers
|
Loading…
Reference in a new issue