diff --git a/mirror.yml b/mirror.yml --- a/mirror.yml +++ b/mirror.yml @@ -7,7 +7,7 @@ deploy: replicas: 1 networks: - - swhtest-mirror + - swh-mirror storage-db: # the main storage database @@ -22,7 +22,7 @@ constraints: - node.labels.org.softwareheritage.mirror.volumes.storage-db == true networks: - - swhtest-mirror + - swh-mirror command: ['-c', 'shared_buffers=4GB', '-c', 'effective_cache_size=4GB', '-c', 'random_page_cost=1.5', '-c', 'max_wal_size=4GB'] environment: POSTGRES_PASSWORD_FILE: /run/secrets/postgres-password @@ -49,7 +49,7 @@ constraints: - node.labels.org.softwareheritage.mirror.volumes.web-db == true networks: - - swhtest-mirror + - swh-mirror command: ['-c', 'shared_buffers=4GB', '-c', 'effective_cache_size=4GB', '-c', 'random_page_cost=1.5', '-c', 'max_wal_size=4GB'] environment: POSTGRES_PASSWORD_FILE: /run/secrets/postgres-password @@ -67,7 +67,7 @@ # the web app; serves both the web navigation interface and the public web API image: softwareheritage/web:${SWH_IMAGE_TAG:-latest} networks: - - swhtest-mirror + - swh-mirror configs: - source: web target: /etc/softwareheritage/config.yml @@ -103,7 +103,7 @@ constraints: - node.labels.org.softwareheritage.mirror.volumes.objstorage == true networks: - - swhtest-mirror + - swh-mirror volumes: - "objstorage:/srv/softwareheritage/objects:rw,Z" configs: @@ -127,7 +127,7 @@ # is upgraded in a consistent way replicas: 1 networks: - - swhtest-mirror + - swh-mirror configs: - source: storage target: /etc/softwareheritage/config.yml @@ -150,7 +150,7 @@ nginx: image: nginx networks: - - swhtest-mirror + - swh-mirror configs: - source: nginx target: /etc/nginx/nginx.conf @@ -162,7 +162,7 @@ prometheus: image: prom/prometheus networks: - - swhtest-mirror + - swh-mirror depends_on: - prometheus-statsd-exporter command: @@ -183,7 +183,7 @@ prometheus-statsd-exporter: image: prom/statsd-exporter networks: - - swhtest-mirror + - swh-mirror command: - "--statsd.mapping-config=/etc/prometheus/statsd-mapping.yml" configs: @@ -200,7 +200,7 @@ grafana: image: grafana/grafana networks: - - swhtest-mirror + - swh-mirror depends_on: - prometheus environment: @@ -236,7 +236,7 @@ constraints: - node.labels.org.softwareheritage.mirror.volumes.redis == true networks: - - swhtest-mirror + - swh-mirror command: - redis-server - --save 60 1 @@ -257,7 +257,7 @@ restart_policy: condition: "none" networks: - - swhtest-mirror + - swh-mirror env_file: - ./env/common-python.env environment: @@ -277,7 +277,7 @@ # do not start replayers by default; see above replicas: 0 networks: - - swhtest-mirror + - swh-mirror env_file: - ./env/common-python.env environment: @@ -296,7 +296,7 @@ amqp: image: rabbitmq:3.6-management networks: - - swhtest-mirror + - swh-mirror ports: - 5072:5672 @@ -314,7 +314,7 @@ constraints: - node.labels.org.softwareheritage.mirror.volumes.web-db == true networks: - - swhtest-mirror + - swh-mirror command: ['-c', 'shared_buffers=4GB', '-c', 'effective_cache_size=4GB', '-c', 'random_page_cost=1.5', '-c', 'max_wal_size=4GB'] environment: POSTGRES_PASSWORD_FILE: /run/secrets/postgres-password @@ -333,7 +333,7 @@ deploy: replicas: 1 networks: - - swhtest-mirror + - swh-mirror env_file: - ./env/common-python.env configs: @@ -357,7 +357,7 @@ deploy: replicas: 1 networks: - - swhtest-mirror + - swh-mirror env_file: - ./env/common-python.env - ./env/celery-worker.env @@ -374,7 +374,7 @@ mailhog: image: mailhog/mailhog networks: - - swhtest-mirror + - swh-mirror ### scheduler services @@ -390,7 +390,7 @@ constraints: - node.labels.org.softwareheritage.mirror.volumes.web-db == true networks: - - swhtest-mirror + - swh-mirror command: ['-c', 'shared_buffers=4GB', '-c', 'effective_cache_size=4GB', '-c', 'random_page_cost=1.5', '-c', 'max_wal_size=4GB'] environment: POSTGRES_PASSWORD_FILE: /run/secrets/postgres-password @@ -409,7 +409,7 @@ deploy: replicas: 1 networks: - - swhtest-mirror + - swh-mirror configs: - source: scheduler target: /etc/softwareheritage/config.yml @@ -432,7 +432,7 @@ deploy: replicas: 1 networks: - - swhtest-mirror + - swh-mirror configs: - source: scheduler target: /etc/softwareheritage/config.yml @@ -455,7 +455,7 @@ deploy: replicas: 1 networks: - - swhtest-mirror + - swh-mirror configs: - source: scheduler target: /etc/softwareheritage/config.yml @@ -529,6 +529,6 @@ networks: - swhtest-mirror: + swh-mirror: driver: overlay attachable: true diff --git a/tests/README.md b/tests/README.md --- a/tests/README.md +++ b/tests/README.md @@ -150,7 +150,7 @@ To run a shell in an image in the Swarm context, use the following: - docker run --network=swhtest_mirror0_swhtest-mirror -ti --env-file env/common-python.env --env STATSD_TAGS="role:content-replayer,hostname:${HOSTNAME}" -v /tmp/pytest-of-lunar/pytest-current/mirrorcurrent/conf/content-replayer.yml:/etc/softwareheritage/config.yml softwareheritage/replayer:20220915-163058 shell + docker run --network=swhtest_mirror0_swh-mirror -ti --env-file env/common-python.env --env STATSD_TAGS="role:content-replayer,hostname:${HOSTNAME}" -v /tmp/pytest-of-lunar/pytest-current/mirrorcurrent/conf/content-replayer.yml:/etc/softwareheritage/config.yml softwareheritage/replayer:20220915-163058 shell ### Some containers are never started @@ -190,4 +190,4 @@ docker volume rm swhtest_mirror0_vault-db -In general, the test has been designed to be run on empty volumes. \ No newline at end of file +In general, the test has been designed to be run on empty volumes.