diff --git a/.circleci/config.yml b/.circleci/config.yml index cba948d832..89ebfa1b6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,7 +105,7 @@ jobs: check-app-layers: docker: - - image: mattermost/mattermost-build-server:20200731_golang-1.14.6 + - image: mattermost/mattermost-build-server:20201119_golang-1.15.5 working_directory: ~/mattermost steps: - attach_workspace: @@ -118,7 +118,7 @@ jobs: check-store-layers: docker: - - image: mattermost/mattermost-build-server:20200731_golang-1.14.6 + - image: mattermost/mattermost-build-server:20201119_golang-1.15.5 working_directory: ~/mattermost steps: - attach_workspace: @@ -161,7 +161,7 @@ jobs: build: docker: - - image: mattermost/mattermost-build-server:20200731_golang-1.14.6 + - image: mattermost/mattermost-build-server:20201119_golang-1.15.5 resource_class: xlarge working_directory: ~/mattermost steps: @@ -235,7 +235,7 @@ jobs: --env MM_SQLSETTINGS_DRIVERNAME=<> \ -v ~/mattermost:/mattermost \ -w /mattermost/mattermost-server \ - mattermost/mattermost-build-server:20200731_golang-1.14.6 \ + mattermost/mattermost-build-server:20201119_golang-1.15.5 \ bash -c "ulimit -n 8096; make test-server BUILD_NUMBER=$CIRCLE_BRANCH-$CIRCLE_PREVIOUS_BUILD_NUM TESTFLAGS= TESTFLAGSEE=" no_output_timeout: 1h - run: @@ -299,7 +299,7 @@ jobs: --env MM_SQLSETTINGS_DRIVERNAME=postgres \ -v ~/mattermost:/mattermost \ -w /mattermost/mattermost-server \ - mattermost/mattermost-build-server:20200731_golang-1.14.6 \ + mattermost/mattermost-build-server:20201119_golang-1.15.5 \ 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" @@ -328,7 +328,7 @@ jobs: --env MM_SQLSETTINGS_DRIVERNAME=mysql \ -v ~/mattermost:/mattermost \ -w /mattermost/mattermost-server \ - mattermost/mattermost-build-server:20200731_golang-1.14.6 \ + mattermost/mattermost-build-server:20201119_golang-1.15.5 \ 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" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9b2eea2a7..6753c4f307 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ empty: # - if: '$ONLY_BUILD != "yes"' # #layers: -# image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201023_golang-1.14.6 +# image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5 # stage: .pre # script: # - make store-layers @@ -81,7 +81,7 @@ empty: # --env MM_SQLSETTINGS_DRIVERNAME=postgres \ # -v $CI_PROJECT_DIR:/mattermost-server \ # -w /mattermost-server \ -# mattermost/mattermost-build-server:20201023_golang-1.14.6 \ +# mattermost/mattermost-build-server:20201119_golang-1.15.5 \ # 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" # - docker logs -f server-postgres # - echo "Generating dump" @@ -110,7 +110,7 @@ empty: # --env MM_SQLSETTINGS_DRIVERNAME=mysql \ # -v $CI_PROJECT_DIR:/mattermost-server \ # -w /mattermost-server \ -# mattermost/mattermost-build-server:20201023_golang-1.14.6 \ +# mattermost/mattermost-build-server:20201119_golang-1.15.5 \ # 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" # - docker logs -f server-mysql # - echo "Ignoring known MySQL mismatch 'ChannelMembers.SchemeGuest'" diff --git a/.gitlab-ci/test.yml b/.gitlab-ci/test.yml index e731bd6b6f..e68e50d210 100644 --- a/.gitlab-ci/test.yml +++ b/.gitlab-ci/test.yml @@ -34,7 +34,7 @@ --env GOBIN=$PWD/bin \ -v $CI_PROJECT_DIR:/mattermost-server \ -w /mattermost-server \ - mattermost/mattermost-build-server:20201023_golang-1.14.6 \ + $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5 \ bash -c "ulimit -n 8096; make test-server BUILD_NUMBER=$CI_COMMIT_SHA TESTFLAGS= TESTFLAGSEE=;" - docker logs -f server - docker-compose logs --tail="all" -t --no-color > logs/docker-compose_logs diff --git a/build/Jenkinsfile.branch b/build/Jenkinsfile.branch index bb5467e23d..83f7be01c8 100644 --- a/build/Jenkinsfile.branch +++ b/build/Jenkinsfile.branch @@ -9,7 +9,7 @@ def platformStages = new org.mattermost.PlatformStages() def rndEE = UUID.randomUUID().toString() def rndTE = UUID.randomUUID().toString() -def mmBuilderServer = 'mattermost/mattermost-build-server:20200731_golang-1.14.6' +def mmBuilderServer = 'mattermost/mattermost-build-server:20201119_golang-1.15.5' def mmBuilderWebapp = 'mattermost/mattermost-build-webapp:oct-2-2018' pipeline { diff --git a/build/README.md b/build/README.md index 05b778a266..3fbf1b5828 100644 --- a/build/README.md +++ b/build/README.md @@ -16,4 +16,4 @@ In our Docker Hub Repository we have the following images: - `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:20200322_golang-1.14.1` which is based on Go 1.14.1 you can use for MM versions >= `5.24.0` -- `mattermost/mattermost-build-server:20200731_golang-1.14.6` which is based on Go 1.14.6 you can use for MM versions >= `5.26.0` +- `mattermost/mattermost-build-server:20201119_golang-1.15.5` which is based on Go 1.14.6 you can use for MM versions >= `5.26.0` diff --git a/build/local-test-env.sh b/build/local-test-env.sh index bc7fceee60..66853225df 100755 --- a/build/local-test-env.sh +++ b/build/local-test-env.sh @@ -32,7 +32,7 @@ up() -e GOPATH="/go" \ -e MM_SQLSETTINGS_DATASOURCE="postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable&connect_timeout=10" \ -e MM_SQLSETTINGS_DRIVERNAME=postgres - mattermost/mattermost-build-server:20200731_golang-1.14.6 bash + mattermost/mattermost-build-server:20201119_golang-1.15.5 bash } down()