From 6c6a64c103c7073840fc786dcf53798928e320fd Mon Sep 17 00:00:00 2001 From: Elisabeth Kulzer Date: Tue, 24 Mar 2020 14:01:49 +0100 Subject: [PATCH] Revert "IS-364: Bump Golang CI. (#14123)" (#14133) This reverts commit 81d6ae220718569ac010359c389dad5d65853583. --- .circleci/config.yml | 10 +++++----- build/Dockerfile.buildenv | 2 +- build/Jenkinsfile.branch | 2 +- build/Jenkinsfile.pr | 16 ++++++++-------- build/README.md | 1 - build/local-test-env.sh | 2 +- plugin/helpers_plugin_test.go | 2 +- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index abb9127328..608ca3ffe9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,7 +98,7 @@ jobs: check-app-layers: docker: - - image: mattermost/mattermost-build-server:20200322_golang-1.14.1 + - image: mattermost/mattermost-build-server:oct-18-2019 working_directory: ~/mattermost steps: - attach_workspace: @@ -111,7 +111,7 @@ jobs: build: docker: - - image: mattermost/mattermost-build-server:20200322_golang-1.14.1 + - image: mattermost/mattermost-build-server:oct-18-2019 resource_class: xlarge working_directory: ~/mattermost steps: @@ -192,7 +192,7 @@ jobs: --env GOBIN=/mattermost/mattermost-server/bin \ -v ~/mattermost:/mattermost \ -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=' no_output_timeout: 1h - run: @@ -265,7 +265,7 @@ jobs: --env MM_ELASTICSEARCHSETTINGS_CONNECTIONURL=http://elasticsearch:9200 \ -v ~/mattermost:/mattermost \ -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' echo "Generating dump" 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 \ -v ~/mattermost:/mattermost \ -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' echo "Ignoring known MySQL mismatch: ChannelMembers.SchemeGuest" diff --git a/build/Dockerfile.buildenv b/build/Dockerfile.buildenv index 956f73bdc0..12f9f54b79 100644 --- a/build/Dockerfile.buildenv +++ b/build/Dockerfile.buildenv @@ -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 diff --git a/build/Jenkinsfile.branch b/build/Jenkinsfile.branch index 82f8b29606..7446917d2a 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:20200322_golang-1.14.1' +def mmBuilderServer = 'mattermost/mattermost-build-server:oct-18-2019' def mmBuilderWebapp = 'mattermost/mattermost-build-webapp:oct-2-2018' pipeline { diff --git a/build/Jenkinsfile.pr b/build/Jenkinsfile.pr index 85b386ebfd..ce62bc7f73 100644 --- a/build/Jenkinsfile.pr +++ b/build/Jenkinsfile.pr @@ -78,7 +78,7 @@ pipeline { } 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') { sh """ cd /go/src/github.com/mattermost/mattermost-server @@ -98,7 +98,7 @@ pipeline { } 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') { sh """ 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') { sh """ 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') { sh """ 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') { sh """ 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') { sh """ 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') { sh """ 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') { sh """ cd /go/src/github.com/mattermost/mattermost-server diff --git a/build/README.md b/build/README.md index 5bb7ab3b05..635cd63907 100644 --- a/build/README.md +++ b/build/README.md @@ -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: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` diff --git a/build/local-test-env.sh b/build/local-test-env.sh index dbcba0c2a7..c2c6c25945 100755 --- a/build/local-test-env.sh +++ b/build/local-test-env.sh @@ -43,7 +43,7 @@ up() -e MM_EMAILSETTINGS_SMTPSERVER="inbucket" \ -e MM_EMAILSETTINGS_SMTPPORT="10025" \ -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() diff --git a/plugin/helpers_plugin_test.go b/plugin/helpers_plugin_test.go index 2dedbc873e..6e1848a283 100644 --- a/plugin/helpers_plugin_test.go +++ b/plugin/helpers_plugin_test.go @@ -42,7 +42,7 @@ func TestInstallPluginFromURL(t *testing.T) { _, err := h.InstallPluginFromURL("http://%41:8080/", replace) 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) {