From 36793d864e3fb8a1454088dbbfc799a6b138691e Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 21 Jan 2021 15:43:11 +0000 Subject: [PATCH 01/10] Add a step for running Complement tests in worker mode --- synapse/pipeline.yml | 47 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index ef05209..5c5be91 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -545,7 +545,7 @@ steps: # Build a docker image from the checked out Synapse source - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." # We use the complement:latest image to provide Complement's dependencies, but want - # to actually run against the latest version of Complement, so download it here. + # to actually run against the master branch of Complement, so download it here. - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" - "tar -xzf master.tar.gz" # Build a second docker image on top of the above image. This one sets up Synapse with a generated config file, @@ -554,7 +554,7 @@ steps: # Finally, compile and run the tests. - "cd complement-master" - "COMPLEMENT_BASE_IMAGE=complement-synapse:latest go test -v -tags synapse_blacklist ./tests" - label: "\U0001F9EA Complement" + label: "\U0001F9EA Complement | Synapse Monolith" agents: queue: "medium" plugins: @@ -570,3 +570,46 @@ steps: # the hosts Docker. volumes: - "/var/run/docker.sock:/var/run/docker.sock" + + - command: + # Build a docker image from the checked out Synapse source + - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." + # Build a second docker image on top of the above image. This one sets up Synapse workers + # as well as everything else it needs to run a federating setup + - "docker build -t matrixdotorg/synapse:workers -f docker/Dockerfile-workers ." + # We use the complement:latest image to provide Complement's dependencies, but want + # to actually run against the master branch of Complement, so download it here. + - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" + - "tar -xzf master.tar.gz" + # Build an image for running the above worker setup in Complement. This involves + # disabling rate-limiting, using Complement's CA etc. + - "docker build -t complement-synapse -f complement-master/dockerfiles/SynapseWorkers.Dockerfile complement-master/dockerfiles" + # Finally, compile and run the tests. + - "cd complement-master" + - "COMPLEMENT_BASE_IMAGE=complement-synapse:latest go test -v -tags synapse_blacklist ./tests" + label: "\U0001F9EA Complement | Synapse Workers" + agents: + # Running every worker takes a beefy system + queue: "xlarge" + plugins: + - docker#v3.7.0: + # The dockerfile for this image is at https://github.com/matrix-org/complement/blob/master/dockerfiles/ComplementCIBuildkite.Dockerfile. + image: "matrixdotorg/complement:latest" + mount-buildkite-agent: false + environment: + # Complement needs to know if it is running under CI + - "CI=true" + # Enable debug logging + - "COMPLEMENT_DEBUG=1" + # Enabled Complement's certificate authority for authentication of + # federation requests + - "COMPLEMENT_CA=true" + # Starting up all the processes in this container can take a little while. + # The default is 200. Let's wait a bit longer to decrease the chance of a + # startup timeout + - "COMPLEMENT_VERSION_CHECK_ITERATIONS=500" + publish: [ "8448:8448" ] + # Complement uses Docker so pass through the docker socket. This means Complement shares + # the hosts Docker. + volumes: + - "/var/run/docker.sock:/var/run/docker.sock" From 21f7305762ce6a621538fe94de649fe76f0b8567 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 25 Jan 2021 15:13:29 +0000 Subject: [PATCH 02/10] Add explanation for why lengthy BK steps cannot be moved to a script --- synapse/pipeline.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index 5c5be91..8e8f801 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -542,6 +542,11 @@ steps: ################################################################################ - command: + # Build the necessary docker images and start Complement. + # Note: We can't place the below steps in a Synapse repo script as this code is + # given access to the host docker socket. We don't want to allow untrusted code + # to be executed with those privileges. + # Build a docker image from the checked out Synapse source - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." # We use the complement:latest image to provide Complement's dependencies, but want @@ -572,6 +577,11 @@ steps: - "/var/run/docker.sock:/var/run/docker.sock" - command: + # Build the necessary docker images and start Complement. + # Note: We can't place the below steps in a Synapse repo script as this code is + # given access to the host docker socket. We don't want to allow untrusted code + # to be executed with those privileges. + # Build a docker image from the checked out Synapse source - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." # Build a second docker image on top of the above image. This one sets up Synapse workers From 1a8e54b0ddc508c48e80119055351097ebb469fe Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 25 Jan 2021 15:33:57 +0000 Subject: [PATCH 03/10] typo --- synapse/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index 8e8f801..08a84dd 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -611,8 +611,8 @@ steps: - "CI=true" # Enable debug logging - "COMPLEMENT_DEBUG=1" - # Enabled Complement's certificate authority for authentication of - # federation requests + # Enable Complement's certificate authority for authentication of federation + # requests - "COMPLEMENT_CA=true" # Starting up all the processes in this container can take a little while. # The default is 200. Let's wait a bit longer to decrease the chance of a From c6a4e8a938cfc0a22edd5e9f37729d71b9a4f560 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 25 Jan 2021 15:43:55 +0000 Subject: [PATCH 04/10] Use YAML anchors for Complement plugin settings, space out commands Additionally move the COMPLEMENT_IMAGE env var to the environment: section. --- synapse/pipeline.yml | 54 ++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index 08a84dd..82cafa6 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -10,6 +10,25 @@ x-yaml-aliases: apt-get update && apt-get install -y xmlsec1 python -m pip install tox + plugins: + - docker#v3.7.0: &complement_docker_common + # The dockerfile for this image is at + # https://github.com/matrix-org/complement/blob/master/dockerfiles/ComplementCIBuildkite.Dockerfile. + image: "matrixdotorg/complement:latest" + mount-buildkite-agent: false + environment: &complement_docker_environment_common + # Specify the docker image to run tests against + - "COMPLEMENT_BASE_IMAGE=complement-synapse:latest" + # Complement needs to know if it is running under CI + - "CI=true" + # Enable debug logging + - "COMPLEMENT_DEBUG=1" + publish: [ "8448:8448" ] + # Complement uses Docker so pass through the docker socket. This means Complement shares + # the hosts Docker. + volumes: + - "/var/run/docker.sock:/var/run/docker.sock" + retry: &retry_setup automatic: - exit_status: -1 @@ -549,6 +568,7 @@ steps: # Build a docker image from the checked out Synapse source - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." + # We use the complement:latest image to provide Complement's dependencies, but want # to actually run against the master branch of Complement, so download it here. - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" @@ -556,25 +576,16 @@ steps: # Build a second docker image on top of the above image. This one sets up Synapse with a generated config file, # signing and SSL keys so Synapse can run and federate - "docker build -t complement-synapse -f complement-master/dockerfiles/Synapse.Dockerfile complement-master/dockerfiles" + # Finally, compile and run the tests. - "cd complement-master" - - "COMPLEMENT_BASE_IMAGE=complement-synapse:latest go test -v -tags synapse_blacklist ./tests" + - "go test -v -tags synapse_blacklist ./tests" label: "\U0001F9EA Complement | Synapse Monolith" agents: queue: "medium" plugins: - docker#v3.7.0: - # The dockerfile for this image is at https://github.com/matrix-org/complement/blob/master/dockerfiles/ComplementCIBuildkite.Dockerfile. - image: "matrixdotorg/complement:latest" - mount-buildkite-agent: false - # Complement needs to know if it is running under CI - environment: - - "CI=true" - publish: [ "8448:8448" ] - # Complement uses Docker so pass through the docker socket. This means Complement shares - # the hosts Docker. - volumes: - - "/var/run/docker.sock:/var/run/docker.sock" + <<: *complement_docker_common - command: # Build the necessary docker images and start Complement. @@ -587,6 +598,7 @@ steps: # Build a second docker image on top of the above image. This one sets up Synapse workers # as well as everything else it needs to run a federating setup - "docker build -t matrixdotorg/synapse:workers -f docker/Dockerfile-workers ." + # We use the complement:latest image to provide Complement's dependencies, but want # to actually run against the master branch of Complement, so download it here. - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" @@ -594,23 +606,20 @@ steps: # Build an image for running the above worker setup in Complement. This involves # disabling rate-limiting, using Complement's CA etc. - "docker build -t complement-synapse -f complement-master/dockerfiles/SynapseWorkers.Dockerfile complement-master/dockerfiles" + # Finally, compile and run the tests. - "cd complement-master" - - "COMPLEMENT_BASE_IMAGE=complement-synapse:latest go test -v -tags synapse_blacklist ./tests" + - "go test -v -tags synapse_blacklist ./tests" label: "\U0001F9EA Complement | Synapse Workers" agents: # Running every worker takes a beefy system queue: "xlarge" plugins: - docker#v3.7.0: - # The dockerfile for this image is at https://github.com/matrix-org/complement/blob/master/dockerfiles/ComplementCIBuildkite.Dockerfile. - image: "matrixdotorg/complement:latest" - mount-buildkite-agent: false + <<: *complement_docker_common + # Override the default plugin settings environment: - # Complement needs to know if it is running under CI - - "CI=true" - # Enable debug logging - - "COMPLEMENT_DEBUG=1" + - *complement_docker_environment_common # Enable Complement's certificate authority for authentication of federation # requests - "COMPLEMENT_CA=true" @@ -618,8 +627,3 @@ steps: # The default is 200. Let's wait a bit longer to decrease the chance of a # startup timeout - "COMPLEMENT_VERSION_CHECK_ITERATIONS=500" - publish: [ "8448:8448" ] - # Complement uses Docker so pass through the docker socket. This means Complement shares - # the hosts Docker. - volumes: - - "/var/run/docker.sock:/var/run/docker.sock" From 0092756563b4940496a6559e7807d3d50508c98f Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 25 Jan 2021 17:56:47 +0000 Subject: [PATCH 05/10] Remove COMPLEMENT_DEBUG env var Synapse's pipeline shouldn't really have this turned on. --- synapse/pipeline.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index 82cafa6..9fe7e16 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -21,8 +21,6 @@ x-yaml-aliases: - "COMPLEMENT_BASE_IMAGE=complement-synapse:latest" # Complement needs to know if it is running under CI - "CI=true" - # Enable debug logging - - "COMPLEMENT_DEBUG=1" publish: [ "8448:8448" ] # Complement uses Docker so pass through the docker socket. This means Complement shares # the hosts Docker. From 6998c3e275b09c522c44e80e19d2f7882742afc0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 25 Jan 2021 18:40:27 +0000 Subject: [PATCH 06/10] Clean up the commands a bit by extracting to a common anchor --- synapse/pipeline.yml | 61 +++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index 9fe7e16..0a5bb89 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -10,6 +10,25 @@ x-yaml-aliases: apt-get update && apt-get install -y xmlsec1 python -m pip install tox + # Note: We can't place the below steps in a Synapse repo script as this code is + # given access to the host docker socket. We don't want to allow untrusted code + # to be executed with those privileges. + - complement_commands_common: &complement_commands_common + # We use the complement:latest image to provide Complement's dependencies, but want + # to actually run against the master branch of Complement, so download it here. + - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" + - "tar -xzf master.tar.gz" + + # Build a second docker image on top of the above image. This one sets up Synapse with a generated config file, + # signing and SSL keys so Synapse can run and federate. The value of the environment + # variable determines which Synapse-flavoured dockerfile to use from Complement repo. + - "docker build -t complement-synapse -f $SYNAPSE_COMPLEMENT_DOCKERFILE complement-master/dockerfiles" + + # Finally, compile and run the tests. + - "cd complement-master" + - "go test -v -tags synapse_blacklist ./tests" + + plugins: - docker#v3.7.0: &complement_docker_common # The dockerfile for this image is at @@ -564,50 +583,37 @@ steps: # given access to the host docker socket. We don't want to allow untrusted code # to be executed with those privileges. - # Build a docker image from the checked out Synapse source + # Build a base docker image from the checked out Synapse source - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." - # We use the complement:latest image to provide Complement's dependencies, but want - # to actually run against the master branch of Complement, so download it here. - - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" - - "tar -xzf master.tar.gz" - # Build a second docker image on top of the above image. This one sets up Synapse with a generated config file, - # signing and SSL keys so Synapse can run and federate - - "docker build -t complement-synapse -f complement-master/dockerfiles/Synapse.Dockerfile complement-master/dockerfiles" + # Build the final dockerfile and run the tests + *complement_commands_common - # Finally, compile and run the tests. - - "cd complement-master" - - "go test -v -tags synapse_blacklist ./tests" label: "\U0001F9EA Complement | Synapse Monolith" agents: queue: "medium" plugins: - docker#v3.7.0: <<: *complement_docker_common + # Override the default plugin settings + environment: + - *complement_docker_environment_common + # Use a Synapse Monolith Dockerfile from Complement. This dockerfile is located at: + # https://github.com/matrix-org/complement/blob/master/dockerfiles/Synapse.Dockerfile + - "SYNAPSE_COMPLEMENT_DOCKERFILE=complement-master/dockerfiles/Synapse.Dockerfile" - command: # Build the necessary docker images and start Complement. - # Note: We can't place the below steps in a Synapse repo script as this code is - # given access to the host docker socket. We don't want to allow untrusted code - # to be executed with those privileges. - # Build a docker image from the checked out Synapse source + # Build a base docker image from the checked out Synapse source - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." + # Build a second docker image on top of the above image. This one sets up Synapse workers - # as well as everything else it needs to run a federating setup - "docker build -t matrixdotorg/synapse:workers -f docker/Dockerfile-workers ." - # We use the complement:latest image to provide Complement's dependencies, but want - # to actually run against the master branch of Complement, so download it here. - - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" - - "tar -xzf master.tar.gz" - # Build an image for running the above worker setup in Complement. This involves - # disabling rate-limiting, using Complement's CA etc. - - "docker build -t complement-synapse -f complement-master/dockerfiles/SynapseWorkers.Dockerfile complement-master/dockerfiles" + # Build the final dockerfile and run the tests + *complement_commands_common - # Finally, compile and run the tests. - - "cd complement-master" - - "go test -v -tags synapse_blacklist ./tests" label: "\U0001F9EA Complement | Synapse Workers" agents: # Running every worker takes a beefy system @@ -618,6 +624,9 @@ steps: # Override the default plugin settings environment: - *complement_docker_environment_common + # Use the Synapse Worker Dockerfile from Complement. This dockerfile is located at: + # https://github.com/matrix-org/complement/blob/master/dockerfiles/SynapseWorkers.Dockerfile + - "SYNAPSE_COMPLEMENT_DOCKERFILE=complement-master/dockerfiles/SynapseWorkers.Dockerfile" # Enable Complement's certificate authority for authentication of federation # requests - "COMPLEMENT_CA=true" From 7500d681f472e710caf4408312d485eaf9490f85 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 25 Jan 2021 20:04:59 +0000 Subject: [PATCH 07/10] Revert "Clean up the commands a bit by extracting to a common anchor" This reverts commit 6998c3e275b09c522c44e80e19d2f7882742afc0. --- synapse/pipeline.yml | 61 +++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index 0a5bb89..9fe7e16 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -10,25 +10,6 @@ x-yaml-aliases: apt-get update && apt-get install -y xmlsec1 python -m pip install tox - # Note: We can't place the below steps in a Synapse repo script as this code is - # given access to the host docker socket. We don't want to allow untrusted code - # to be executed with those privileges. - - complement_commands_common: &complement_commands_common - # We use the complement:latest image to provide Complement's dependencies, but want - # to actually run against the master branch of Complement, so download it here. - - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" - - "tar -xzf master.tar.gz" - - # Build a second docker image on top of the above image. This one sets up Synapse with a generated config file, - # signing and SSL keys so Synapse can run and federate. The value of the environment - # variable determines which Synapse-flavoured dockerfile to use from Complement repo. - - "docker build -t complement-synapse -f $SYNAPSE_COMPLEMENT_DOCKERFILE complement-master/dockerfiles" - - # Finally, compile and run the tests. - - "cd complement-master" - - "go test -v -tags synapse_blacklist ./tests" - - plugins: - docker#v3.7.0: &complement_docker_common # The dockerfile for this image is at @@ -583,37 +564,50 @@ steps: # given access to the host docker socket. We don't want to allow untrusted code # to be executed with those privileges. - # Build a base docker image from the checked out Synapse source + # Build a docker image from the checked out Synapse source - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." - # Build the final dockerfile and run the tests - *complement_commands_common + # We use the complement:latest image to provide Complement's dependencies, but want + # to actually run against the master branch of Complement, so download it here. + - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" + - "tar -xzf master.tar.gz" + # Build a second docker image on top of the above image. This one sets up Synapse with a generated config file, + # signing and SSL keys so Synapse can run and federate + - "docker build -t complement-synapse -f complement-master/dockerfiles/Synapse.Dockerfile complement-master/dockerfiles" + # Finally, compile and run the tests. + - "cd complement-master" + - "go test -v -tags synapse_blacklist ./tests" label: "\U0001F9EA Complement | Synapse Monolith" agents: queue: "medium" plugins: - docker#v3.7.0: <<: *complement_docker_common - # Override the default plugin settings - environment: - - *complement_docker_environment_common - # Use a Synapse Monolith Dockerfile from Complement. This dockerfile is located at: - # https://github.com/matrix-org/complement/blob/master/dockerfiles/Synapse.Dockerfile - - "SYNAPSE_COMPLEMENT_DOCKERFILE=complement-master/dockerfiles/Synapse.Dockerfile" - command: # Build the necessary docker images and start Complement. + # Note: We can't place the below steps in a Synapse repo script as this code is + # given access to the host docker socket. We don't want to allow untrusted code + # to be executed with those privileges. - # Build a base docker image from the checked out Synapse source + # Build a docker image from the checked out Synapse source - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." - # Build a second docker image on top of the above image. This one sets up Synapse workers + # as well as everything else it needs to run a federating setup - "docker build -t matrixdotorg/synapse:workers -f docker/Dockerfile-workers ." - # Build the final dockerfile and run the tests - *complement_commands_common + # We use the complement:latest image to provide Complement's dependencies, but want + # to actually run against the master branch of Complement, so download it here. + - "wget https://github.com/matrix-org/complement/archive/master.tar.gz" + - "tar -xzf master.tar.gz" + # Build an image for running the above worker setup in Complement. This involves + # disabling rate-limiting, using Complement's CA etc. + - "docker build -t complement-synapse -f complement-master/dockerfiles/SynapseWorkers.Dockerfile complement-master/dockerfiles" + # Finally, compile and run the tests. + - "cd complement-master" + - "go test -v -tags synapse_blacklist ./tests" label: "\U0001F9EA Complement | Synapse Workers" agents: # Running every worker takes a beefy system @@ -624,9 +618,6 @@ steps: # Override the default plugin settings environment: - *complement_docker_environment_common - # Use the Synapse Worker Dockerfile from Complement. This dockerfile is located at: - # https://github.com/matrix-org/complement/blob/master/dockerfiles/SynapseWorkers.Dockerfile - - "SYNAPSE_COMPLEMENT_DOCKERFILE=complement-master/dockerfiles/SynapseWorkers.Dockerfile" # Enable Complement's certificate authority for authentication of federation # requests - "COMPLEMENT_CA=true" From 19ed5c649261661f00cc802b282024fb0d990061 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 26 Apr 2021 16:57:13 +0100 Subject: [PATCH 08/10] Factor out complement test run command Mostly so we don't have to remember to update the -tags in both commands --- synapse/pipeline.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index eea51ba..530e98d 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -27,6 +27,9 @@ x-yaml-aliases: volumes: - "/var/run/docker.sock:/var/run/docker.sock" + # The common command for running Complement tests against Synapse + - &complement_run_tests_command "go test -v -tags synapse_blacklist,msc2946,msc3083 ./tests" + retry: &retry_setup automatic: - exit_status: -1 @@ -590,10 +593,12 @@ steps: # Build a second docker image on top of the above image. This one sets up Synapse with a generated config file, # signing and SSL keys so Synapse can run and federate - "docker build -t complement-synapse -f complement-master/dockerfiles/Synapse.Dockerfile complement-master/dockerfiles" + - "export COMPLEMENT_BASE_IMAGE=complement-synapse" # Finally, compile and run the tests. - "cd complement-master" - - "COMPLEMENT_BASE_IMAGE=complement-synapse:latest go test -v -tags synapse_blacklist,msc2946,msc3083 ./tests" + - *complement_run_tests_command + label: "\U0001F9EA Complement | Synapse Monolith" agents: queue: "medium" @@ -619,11 +624,12 @@ steps: - "tar -xzf master.tar.gz" # Build an image for running the above worker setup in Complement. This involves # disabling rate-limiting, using Complement's CA etc. - - "docker build -t complement-synapse -f complement-master/dockerfiles/SynapseWorkers.Dockerfile complement-master/dockerfiles" + - "docker build -t complement-synapse-workers -f complement-master/dockerfiles/SynapseWorkers.Dockerfile complement-master/dockerfiles" + - "export COMPLEMENT_BASE_IMAGE=complement-synapse-workers" # Finally, compile and run the tests. - "cd complement-master" - - "COMPLEMENT_BASE_IMAGE=complement-synapse:latest go test -v -tags synapse_blacklist,msc2946,msc3083 ./tests" + - *complement_run_tests_command label: "\U0001F9EA Complement | Synapse Workers" agents: # Running every worker takes a beefy system From 8fa20b89b27aad78df87ee44469704c17598019f Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 26 Apr 2021 16:58:25 +0100 Subject: [PATCH 09/10] Update the worker-flavoured docker image tag to synapse-workers Also remove redundant :latest tag for base Synapse images. --- synapse/pipeline.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index 530e98d..daab0a8 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -584,7 +584,7 @@ steps: # to be executed with those privileges. # Build a docker image from the checked out Synapse source - - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." + - "docker build -t matrixdotorg/synapse -f docker/Dockerfile ." # We use the complement:latest image to provide Complement's dependencies, but want # to actually run against the master branch of Complement, so download it here. @@ -613,10 +613,10 @@ steps: # to be executed with those privileges. # Build a docker image from the checked out Synapse source - - "docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile ." + - "docker build -t matrixdotorg/synapse -f docker/Dockerfile ." # Build a second docker image on top of the above image. This one sets up Synapse workers # as well as everything else it needs to run a federating setup - - "docker build -t matrixdotorg/synapse:workers -f docker/Dockerfile-workers ." + - "docker build -t matrixdotorg/synapse-workers -f docker/Dockerfile-workers ." # We use the complement:latest image to provide Complement's dependencies, but want # to actually run against the master branch of Complement, so download it here. From 855e04599836d10db06b52dbfa9c97925ff2a2e6 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 26 Apr 2021 16:59:43 +0100 Subject: [PATCH 10/10] Remove some unnecessary newlines that snuck in --- synapse/pipeline.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/synapse/pipeline.yml b/synapse/pipeline.yml index daab0a8..b16c3ff 100644 --- a/synapse/pipeline.yml +++ b/synapse/pipeline.yml @@ -575,8 +575,6 @@ steps: # ################################################################################ - - - command: # Build the necessary docker images and start Complement. # Note: We can't place the below steps in a Synapse repo script as this code is