mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Revert "Prepare: run E2E smoketests with GitHub actions (#23301)" (#23553)

Просмотр исходного кода 
This reverts commit 68be3a6bcd.
Этот коммит содержится в:
mvitale1989
2023-05-31 16:32:51 +02:00
коммит произвёл GitHub
родитель 676a83b351
Коммит 74beab5ad5
25 изменённых файлов: 49 добавлений и 623 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

57
server/build/gitlab-dc.common.yml
Просмотреть файл

@@ -1,44 +1,29 @@
version: '2.4'
services:
minio:
image: public.ecr.aws/mattermostqa/minio:RELEASE.2019-10-11T00-38-09Z-1
image: ${CI_REGISTRY}/mattermost/ci/images/minio:RELEASE.2019-10-11T00-38-09Z-1
command: "server /data"
environment:
MINIO_ACCESS_KEY: minioaccesskey
MINIO_SECRET_KEY: miniosecretkey
MINIO_SSE_MASTER_KEY: "my-minio-key:6368616e676520746869732070617373776f726420746f206120736563726574"
healthcheck:
test: [ "CMD", "nc", "-z", "-w1", "127.0.0.1", "9000" ]
interval: 10s
timeout: 15s
retries: 12
inbucket:
image: public.ecr.aws/mattermostqa/inbucket:3.0.0
image: ${CI_REGISTRY}/mattermost/ci/images/inbucket:v3.0.0-rc1-2-gc64e7a6-1
restart: always
environment:
INBUCKET_WEB_ADDR: "0.0.0.0:9001"
INBUCKET_POP3_ADDR: "0.0.0.0:10110"
INBUCKET_SMTP_ADDR: "0.0.0.0:10025"
healthcheck:
test: [ "CMD", "nc", "-z", "-w1", "127.0.0.1", "10025" ]
interval: 10s
timeout: 15s
retries: 12
openldap:
image: public.ecr.aws/mattermostqa/openldap:1.4.0
image: ${CI_REGISTRY}/mattermost/ci/images/openldap:1.4.0-1
restart: always
environment:
LDAP_TLS_VERIFY_CLIENT: "never"
LDAP_ORGANISATION: "Mattermost Test"
LDAP_DOMAIN: "mm.test.com"
LDAP_ADMIN_PASSWORD: "mostest"
healthcheck:
test: [ "CMD", "bash", "-o", "pipefail", "-c", "ss -ltn 'sport = :636' | grep -qE '^LISTEN'" ]
interval: 10s
timeout: 15s
retries: 12
elasticsearch:
image: mattermost/mattermost-elasticsearch-docker:7.17.3
image: ${CI_REGISTRY}/mattermost/ci/images/mattermost-elasticsearch-docker:7.17.3
environment:
http.host: "0.0.0.0"
http.port: 9200
@@ -48,20 +33,10 @@ services:
http.cors.allow-credentials: "true"
transport.host: "127.0.0.1"
ES_JAVA_OPTS: "-Xms512m -Xmx512m"
healthcheck:
test: [ "CMD", "bash", "-o", "pipefail", "-c", "curl --silent localhost:9200/_cat/health | awk '{ print $$4 }' | grep -qE '^green$$'" ]
interval: 10s
timeout: 15s
retries: 12
dejavu:
image: public.ecr.aws/mattermostqa/dejavu:3.4.2
healthcheck:
test: [ "CMD", "nc", "-z", "-w1", "127.0.0.1", "1358" ]
interval: 10s
timeout: 15s
retries: 12
image: ${CI_REGISTRY}/mattermost/ci/images/dejavu:3.4.2-1
keycloak:
image: public.ecr.aws/mattermostqa/keycloak:10.0.2
image: ${CI_REGISTRY}/mattermost/ci/images/keycloak:10.0.2-1
restart: always
environment:
KEYCLOAK_USER: mmuser
@@ -70,29 +45,13 @@ services:
KEYCLOAK_IMPORT: /setup/realm.json
volumes:
- "./docker/keycloak:/setup"
healthcheck:
test: [ "CMD", "bash", "-o", "pipefail", "-c", "curl --silent localhost:9990/health | grep -q '\"status\":\"UP\"'" ]
interval: 10s
timeout: 15s
retries: 12
prometheus:
image: public.ecr.aws/mattermostqa/prometheus:v2.27.1
image: ${CI_REGISTRY}/mattermost/ci/images/prometheus:2.27.1-1
volumes:
- "./docker/prometheus-linux.yml:/etc/prometheus/prometheus.yml"
healthcheck:
test: [ "CMD", "wget", "-q", "-O-", "127.0.0.1:9090/-/ready" ]
interval: 10s
timeout: 15s
retries: 12
# wget -q -O- localhost:3000/healthz | grep -q Ok
grafana:
image: public.ecr.aws/mattermostqa/grafana:8.0.1
image: ${CI_REGISTRY}/mattermost/ci/images/grafana:8.0.1-1
volumes:
- "./docker/grafana/grafana.ini:/etc/grafana/grafana.ini"
- "./docker/grafana/provisioning:/etc/grafana/provisioning"
- "./docker/grafana/dashboards:/var/lib/grafana/dashboards"
healthcheck:
test: [ "CMD", "bash", "-o", "pipefail", "-c", "wget -q -O- localhost:3000/healthz | grep -q Ok" ]
interval: 10s
timeout: 15s
retries: 12

9
server/build/gitlab-dc.mysql.yml
Просмотреть файл

@@ -1,7 +1,7 @@
version: '2.4'
services:
mysql:
image: public.ecr.aws/mattermostqa/mysql:5.7.12
image: ${CI_REGISTRY}/mattermost/ci/images/mysql:5.7-1
restart: always
environment:
MYSQL_ROOT_HOST: "%"
@@ -83,7 +83,7 @@ services:
- grafana
start_dependencies:
image: mattermost/mattermost-wait-for-dep:latest
image: ${CI_REGISTRY}/mattermost/ci/images/mattermost-wait-for-dep:latest-1
depends_on:
- mysql
- minio
@@ -95,3 +95,8 @@ services:
command: mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
networks:
default:
networks:
default:
external:
name: ${COMPOSE_PROJECT_NAME}

16
server/build/gitlab-dc.postgres.yml
Просмотреть файл

@@ -1,7 +1,7 @@
version: '2.4'
services:
postgres:
image: public.ecr.aws/mattermostqa/postgres:12
image: ${CI_REGISTRY}/mattermost/ci/images/postgres:10-1
restart: always
environment:
POSTGRES_USER: mmuser
@@ -12,9 +12,9 @@ services:
- "./docker/postgres.conf:/etc/postgresql/postgresql.conf"
healthcheck:
test: [ "CMD", "pg_isready", "-h", "localhost" ]
interval: 10s
timeout: 15s
retries: 12
interval: 5s
timeout: 10s
retries: 3
networks:
default:
aliases:
@@ -81,7 +81,7 @@ services:
- grafana
start_dependencies:
image: mattermost/mattermost-wait-for-dep:latest
image: ${CI_REGISTRY}/mattermost/ci/images/mattermost-wait-for-dep:latest-1
depends_on:
- postgres
- minio
@@ -93,3 +93,9 @@ services:
command: postgres:5432 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
networks:
default:
networks:
default:
external:
name: ${COMPOSE_PROJECT_NAME}

9
server/build/gitlab-dc.schemamysql.yml
Просмотреть файл

@@ -1,7 +1,7 @@
version: '2.4'
services:
mysql:
image: public.ecr.aws/mattermostqa/mysql:5.7.12
image: ${CI_REGISTRY}/mattermost/ci/images/mysql:5.7-1
restart: always
environment:
MYSQL_ROOT_HOST: "%"
@@ -23,9 +23,14 @@ services:
- mysql
start_dependencies:
image: mattermost/mattermost-wait-for-dep:latest
image: ${CI_REGISTRY}/mattermost/ci/images/mattermost-wait-for-dep:latest-1
depends_on:
- mysql
command: mysql:3306
networks:
default:
networks:
default:
external:
name: ${COMPOSE_PROJECT_NAME}

9
server/build/gitlab-dc.schemapostgres.yml
Просмотреть файл

@@ -1,7 +1,7 @@
version: '2.4'
services:
postgres:
image: public.ecr.aws/mattermostqa/postgres:12
image: ${CI_REGISTRY}/mattermost/ci/images/postgres:10-1
restart: always
environment:
POSTGRES_USER: mmuser
@@ -21,9 +21,14 @@ services:
- postgres
start_dependencies:
image: mattermost/mattermost-wait-for-dep:latest
image: ${CI_REGISTRY}/mattermost/ci/images/mattermost-wait-for-dep:latest-1
depends_on:
- postgres
command: postgres:5432
networks:
default:
networks:
default:
external:
name: ${COMPOSE_PROJECT_NAME}