This reverts commit 81d6ae2207.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
81d6ae2207
Коммит
6c6a64c103
@@ -98,7 +98,7 @@ jobs:
|
|||||||
|
|
||||||
check-app-layers:
|
check-app-layers:
|
||||||
docker:
|
docker:
|
||||||
- image: mattermost/mattermost-build-server:20200322_golang-1.14.1
|
- image: mattermost/mattermost-build-server:oct-18-2019
|
||||||
working_directory: ~/mattermost
|
working_directory: ~/mattermost
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
@@ -111,7 +111,7 @@ jobs:
|
|||||||
|
|
||||||
build:
|
build:
|
||||||
docker:
|
docker:
|
||||||
- image: mattermost/mattermost-build-server:20200322_golang-1.14.1
|
- image: mattermost/mattermost-build-server:oct-18-2019
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
working_directory: ~/mattermost
|
working_directory: ~/mattermost
|
||||||
steps:
|
steps:
|
||||||
@@ -192,7 +192,7 @@ jobs:
|
|||||||
--env GOBIN=/mattermost/mattermost-server/bin \
|
--env GOBIN=/mattermost/mattermost-server/bin \
|
||||||
-v ~/mattermost:/mattermost \
|
-v ~/mattermost:/mattermost \
|
||||||
-w /mattermost/mattermost-server \
|
-w /mattermost/mattermost-server \
|
||||||
mattermost/mattermost-build-server:20200322_golang-1.14.1 \
|
mattermost/mattermost-build-server:oct-18-2019 \
|
||||||
bash -c 'ulimit -n 8096; make test-server BUILD_NUMBER="$CIRCLE_BRANCH-$CIRCLE_PREVIOUS_BUILD_NUM" TESTFLAGS= TESTFLAGSEE='
|
bash -c 'ulimit -n 8096; make test-server BUILD_NUMBER="$CIRCLE_BRANCH-$CIRCLE_PREVIOUS_BUILD_NUM" TESTFLAGS= TESTFLAGSEE='
|
||||||
no_output_timeout: 1h
|
no_output_timeout: 1h
|
||||||
- run:
|
- run:
|
||||||
@@ -265,7 +265,7 @@ jobs:
|
|||||||
--env MM_ELASTICSEARCHSETTINGS_CONNECTIONURL=http://elasticsearch:9200 \
|
--env MM_ELASTICSEARCHSETTINGS_CONNECTIONURL=http://elasticsearch:9200 \
|
||||||
-v ~/mattermost:/mattermost \
|
-v ~/mattermost:/mattermost \
|
||||||
-w /mattermost/mattermost-server \
|
-w /mattermost/mattermost-server \
|
||||||
mattermost/mattermost-build-server:20200322_golang-1.14.1 \
|
mattermost/mattermost-build-server:oct-18-2019 \
|
||||||
bash -c 'ulimit -n 8096; make ARGS="version" run-cli && make MM_SQLSETTINGS_DATASOURCE="postgres://mmuser:mostest@postgres:5432/latest?sslmode=disable&connect_timeout=10" ARGS="version" run-cli'
|
bash -c 'ulimit -n 8096; make ARGS="version" run-cli && make MM_SQLSETTINGS_DATASOURCE="postgres://mmuser:mostest@postgres:5432/latest?sslmode=disable&connect_timeout=10" ARGS="version" run-cli'
|
||||||
echo "Generating dump"
|
echo "Generating dump"
|
||||||
docker-compose --no-ansi exec -T postgres pg_dump --schema-only -d migrated -U mmuser > migrated.sql
|
docker-compose --no-ansi exec -T postgres pg_dump --schema-only -d migrated -U mmuser > migrated.sql
|
||||||
@@ -301,7 +301,7 @@ jobs:
|
|||||||
--env MM_ELASTICSEARCHSETTINGS_CONNECTIONURL=http://elasticsearch:9200 \
|
--env MM_ELASTICSEARCHSETTINGS_CONNECTIONURL=http://elasticsearch:9200 \
|
||||||
-v ~/mattermost:/mattermost \
|
-v ~/mattermost:/mattermost \
|
||||||
-w /mattermost/mattermost-server \
|
-w /mattermost/mattermost-server \
|
||||||
mattermost/mattermost-build-server:20200322_golang-1.14.1 \
|
mattermost/mattermost-build-server:oct-18-2019 \
|
||||||
bash -c 'ulimit -n 8096; make ARGS="version" run-cli && make MM_SQLSETTINGS_DATASOURCE="mmuser:mostest@tcp(mysql:3306)/latest?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s" ARGS="version" run-cli'
|
bash -c 'ulimit -n 8096; make ARGS="version" run-cli && make MM_SQLSETTINGS_DATASOURCE="mmuser:mostest@tcp(mysql:3306)/latest?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s" ARGS="version" run-cli'
|
||||||
|
|
||||||
echo "Ignoring known MySQL mismatch: ChannelMembers.SchemeGuest"
|
echo "Ignoring known MySQL mismatch: ChannelMembers.SchemeGuest"
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
FROM golang:1.14.1
|
FROM golang:1.13
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y make git apt-transport-https ca-certificates curl software-properties-common build-essential zip xmlsec1 jq
|
RUN apt-get update && apt-get install -y make git apt-transport-https ca-certificates curl software-properties-common build-essential zip xmlsec1 jq
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ def platformStages = new org.mattermost.PlatformStages()
|
|||||||
|
|
||||||
def rndEE = UUID.randomUUID().toString()
|
def rndEE = UUID.randomUUID().toString()
|
||||||
def rndTE = UUID.randomUUID().toString()
|
def rndTE = UUID.randomUUID().toString()
|
||||||
def mmBuilderServer = 'mattermost/mattermost-build-server:20200322_golang-1.14.1'
|
def mmBuilderServer = 'mattermost/mattermost-build-server:oct-18-2019'
|
||||||
def mmBuilderWebapp = 'mattermost/mattermost-build-webapp:oct-2-2018'
|
def mmBuilderWebapp = 'mattermost/mattermost-build-webapp:oct-2-2018'
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
steps {
|
steps {
|
||||||
withDockerContainer(args: '-u root --privileged -v ${WORKSPACE}/src:/go/src/', image: 'mattermost/mattermost-build-server:20200322_golang-1.14.1') {
|
withDockerContainer(args: '-u root --privileged -v ${WORKSPACE}/src:/go/src/', image: 'mattermost/mattermost-build-server:sep-17-2019') {
|
||||||
ansiColor('xterm') {
|
ansiColor('xterm') {
|
||||||
sh """
|
sh """
|
||||||
cd /go/src/github.com/mattermost/mattermost-server
|
cd /go/src/github.com/mattermost/mattermost-server
|
||||||
@@ -98,7 +98,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
steps {
|
steps {
|
||||||
withDockerContainer(args: '-u root --privileged -v ${WORKSPACE}/src:/go/src/', image: 'mattermost/mattermost-build-server:20200322_golang-1.14.1') {
|
withDockerContainer(args: '-u root --privileged -v ${WORKSPACE}/src:/go/src/', image: 'mattermost/mattermost-build-server:oct-18-2019') {
|
||||||
ansiColor('xterm') {
|
ansiColor('xterm') {
|
||||||
sh """
|
sh """
|
||||||
cd /go/src/github.com/mattermost/mattermost-server
|
cd /go/src/github.com/mattermost/mattermost-server
|
||||||
@@ -281,7 +281,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:20200322_golang-1.14.1') {
|
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:oct-18-2019') {
|
||||||
ansiColor('xterm') {
|
ansiColor('xterm') {
|
||||||
sh """
|
sh """
|
||||||
cd /go/src/github.com/mattermost/mattermost-server
|
cd /go/src/github.com/mattermost/mattermost-server
|
||||||
@@ -337,7 +337,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:20200322_golang-1.14.1') {
|
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:oct-18-2019') {
|
||||||
ansiColor('xterm') {
|
ansiColor('xterm') {
|
||||||
sh """
|
sh """
|
||||||
cd /go/src/github.com/mattermost/mattermost-server
|
cd /go/src/github.com/mattermost/mattermost-server
|
||||||
@@ -384,7 +384,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:20200322_golang-1.14.1') {
|
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:oct-18-2019') {
|
||||||
ansiColor('xterm') {
|
ansiColor('xterm') {
|
||||||
sh """
|
sh """
|
||||||
cd /go/src/github.com/mattermost/mattermost-server
|
cd /go/src/github.com/mattermost/mattermost-server
|
||||||
@@ -448,7 +448,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:20200322_golang-1.14.1') {
|
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:oct-18-2019') {
|
||||||
ansiColor('xterm') {
|
ansiColor('xterm') {
|
||||||
sh """
|
sh """
|
||||||
cd /go/src/github.com/mattermost/mattermost-server
|
cd /go/src/github.com/mattermost/mattermost-server
|
||||||
@@ -504,7 +504,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:20200322_golang-1.14.1') {
|
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:oct-18-2019') {
|
||||||
ansiColor('xterm') {
|
ansiColor('xterm') {
|
||||||
sh """
|
sh """
|
||||||
cd /go/src/github.com/mattermost/mattermost-server
|
cd /go/src/github.com/mattermost/mattermost-server
|
||||||
@@ -551,7 +551,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:20200322_golang-1.14.1') {
|
withDockerContainer(args: "-u root --privileged --net ${COMPOSE_PROJECT_NAME}_mm-test -v ${WORKSPACE}/src:/go/src/", image: 'mattermost/mattermost-build-server:oct-18-2019') {
|
||||||
ansiColor('xterm') {
|
ansiColor('xterm') {
|
||||||
sh """
|
sh """
|
||||||
cd /go/src/github.com/mattermost/mattermost-server
|
cd /go/src/github.com/mattermost/mattermost-server
|
||||||
|
|||||||
@@ -17,4 +17,3 @@ In our Docker Hub Repository we have the following images:
|
|||||||
- `mattermost/mattermost-build-server:dec-7-2018` which is based on Go 1.11 you can use for MM versions <= `5.8.0`
|
- `mattermost/mattermost-build-server:dec-7-2018` which is based on Go 1.11 you can use for MM versions <= `5.8.0`
|
||||||
- `mattermost/mattermost-build-server:feb-28-2019` which is based on Go 1.12 you can use for MM versions >= `5.9.0` <= `5.15.0`
|
- `mattermost/mattermost-build-server:feb-28-2019` which is based on Go 1.12 you can use for MM versions >= `5.9.0` <= `5.15.0`
|
||||||
- `mattermost/mattermost-build-server:sep-17-2019` which is based on Go 1.12.9 you can use for MM versions >= `5.16.0`
|
- `mattermost/mattermost-build-server:sep-17-2019` which is based on Go 1.12.9 you can use for MM versions >= `5.16.0`
|
||||||
- `mattermost/mattermost-build-server:20200322_golang-1.14.1` which is based on Go 1.14.1 you can use for MM versions >= `5.24.0`
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ up()
|
|||||||
-e MM_EMAILSETTINGS_SMTPSERVER="inbucket" \
|
-e MM_EMAILSETTINGS_SMTPSERVER="inbucket" \
|
||||||
-e MM_EMAILSETTINGS_SMTPPORT="10025" \
|
-e MM_EMAILSETTINGS_SMTPPORT="10025" \
|
||||||
-e MM_ELASTICSEARCHSETTINGS_CONNECTIONURL="http://elasticsearch:9200" \
|
-e MM_ELASTICSEARCHSETTINGS_CONNECTIONURL="http://elasticsearch:9200" \
|
||||||
mattermost/mattermost-build-server:20200322_golang-1.14.1 /bin/bash
|
mattermost/mattermost-build-server:sep-17-2019 /bin/bash
|
||||||
}
|
}
|
||||||
|
|
||||||
down()
|
down()
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ func TestInstallPluginFromURL(t *testing.T) {
|
|||||||
_, err := h.InstallPluginFromURL("http://%41:8080/", replace)
|
_, err := h.InstallPluginFromURL("http://%41:8080/", replace)
|
||||||
|
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
assert.Equal(t, "error while parsing url: parse \"http://%41:8080/\": invalid URL escape \"%41\"", err.Error())
|
assert.Equal(t, "error while parsing url: parse http://%41:8080/: invalid URL escape \"%41\"", err.Error())
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("errors out while downloading file", func(t *testing.T) {
|
t.Run("errors out while downloading file", func(t *testing.T) {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user