migrate mint tests to latest versions (minio#9424)

harshavardhana · web-flow · commit 6817c5ea58fb · 2020-04-22T16:06:58.000-07:00
diff --git a/Dockerfile.mint b/Dockerfile.mint
@@ -1,17 +1,11 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND noninteractive
-
 ENV LANG C.UTF-8
-
 ENV GOROOT /usr/local/go
-
-ENV GOPATH /usr/local
-
+ENV GOPATH /usr/local/gopath
 ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
-
 ENV MINT_ROOT_DIR /mint
-
 COPY mint /mint
 
 RUN apt-get --yes update && apt-get --yes upgrade && \
diff --git a/Dockerfile.simpleci b/Dockerfile.simpleci
@@ -57,7 +57,7 @@ RUN yarn test
 #-------------------------------------------------------------
 # Stage 3: Run Gateway Tests
 #-------------------------------------------------------------
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 COPY --from=0 /go/src/github.com/minio/minio/minio /usr/bin/minio
 COPY buildscripts/gateway-tests.sh /usr/bin/gateway-tests.sh
@@ -66,7 +66,7 @@ COPY mint /mint
 ENV DEBIAN_FRONTEND noninteractive
 ENV LANG C.UTF-8
 ENV GOROOT /usr/local/go
-ENV GOPATH /usr/local
+ENV GOPATH /usr/local/gopath
 ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
 ENV SIMPLE_CI 1
 ENV MINT_ROOT_DIR /mint
diff --git a/buildscripts/gateway-tests.sh b/buildscripts/gateway-tests.sh
@@ -48,7 +48,7 @@ function main()
     SERVER_ENDPOINT=127.0.0.1:24240 ENABLE_HTTPS=0 ACCESS_KEY=minio \
                    SECRET_KEY=minio123 MINT_MODE="full" /mint/entrypoint.sh \
                    aws-sdk-go aws-sdk-java aws-sdk-php aws-sdk-ruby awscli \
-                   healthcheck mc minio-dotnet minio-java minio-js \
+                   healthcheck mc minio-dotnet minio-js \
                    minio-py s3cmd s3select security
     rv=$?
 
diff --git a/mint/Dockerfile.dev b/mint/Dockerfile.dev
diff --git a/mint/README.md b/mint/README.md
@@ -82,7 +82,7 @@ All test logs are stored in `/mint/log/log.json` as multiple JSON document.  Bel
 After making changes to Mint source code a local docker image can be built/run by
 
 ```sh
-$ docker build -t minio/mint . -f Dockerfile.dev
+$ docker build -t minio/mint . -f Dockerfile.mint
 $ docker run -e SERVER_ENDPOINT=play.minio.io:9000 -e ACCESS_KEY=Q3AM3UQ867SPQQA43P2F \
              -e SECRET_KEY=zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG \
              -e ENABLE_HTTPS=1 -e MINT_MODE=full minio/mint:latest
diff --git a/mint/build/aws-sdk-ruby/install.sh b/mint/build/aws-sdk-ruby/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-#  Mint (C) 2017 Minio, Inc.
+#  Mint (C) 20172-2020 Minio, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 #  limitations under the License.
 #
 
-gem install --no-rdoc --no-ri aws-sdk-resources:3.56.0 aws-sdk multipart_body
+gem install --no-rdoc --no-ri aws-sdk-resources aws-sdk multipart_body
diff --git a/mint/build/awscli/install.sh b/mint/build/awscli/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-#  Mint (C) 2017 Minio, Inc.
+#  Mint (C) 2017-2020 Minio, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -15,6 +15,4 @@
 #  limitations under the License.
 #
 
-AWS_CLI_VERSION="1.16.309"
-
-python -m pip install awscli==$AWS_CLI_VERSION
+pip3 install awscli --upgrade
diff --git a/mint/build/minio-dotnet/install.sh b/mint/build/minio-dotnet/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  Mint (C) 2017 Minio, Inc.
+#  Mint (C) 2017-2020 Minio, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -39,4 +39,4 @@ rm -fr "${temp_dir}"
 
 cd "$MINIO_DOTNET_SDK_PATH"
 dotnet restore /p:Configuration=Mint
-dotnet publish --runtime ubuntu.16.04-x64 --output out /p:Configuration=Mint
+dotnet publish --runtime ubuntu.18.04-x64 --output out /p:Configuration=Mint
diff --git a/mint/build/minio-py/install.sh b/mint/build/minio-py/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-#  Mint (C) 2017 Minio, Inc.
+#  Mint (C) 2017-2020 Minio, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -22,8 +22,6 @@ if [ -z "$MINIO_PY_VERSION" ]; then
 fi
 
 test_run_dir="$MINT_RUN_CORE_DIR/minio-py"
-# FIX https://github.com/pypa/pip/issues/5221
-python -m pip install --upgrade pip
-python -m pip install --user faker
-python -m pip install minio=="$MINIO_PY_VERSION"
+pip3 install --user faker
+pip3 install minio=="$MINIO_PY_VERSION"
 $WGET --output-document="$test_run_dir/tests.py" "https://raw.githubusercontent.com/minio/minio-py/${MINIO_PY_VERSION}/tests/functional/tests.py"
diff --git a/mint/install-packages.list b/mint/install-packages.list
@@ -1,17 +1,18 @@
 git
 python3-pip
 nodejs
+openjdk-8-jdk
+openjdk-8-jre
+dirmngr
+apt-transport-https
+dotnet-sdk-2.1
+ca-certificates-mono
+nuget
+libunwind8
 ruby
 ruby-dev
 ruby-bundler
 php
-php7.0-curl
+php-curl
 php-xml
-default-jre
-default-jdk
 ant
-dirmngr
-dotnet-sdk-2.1
-ca-certificates-mono
-nuget
-libunwind8
diff --git a/mint/mint.sh b/mint/mint.sh
@@ -111,7 +111,7 @@ function trust_s3_endpoint_tls_cert()
     # Download the public certificate from the server
     openssl s_client -showcerts -connect "$SERVER_ENDPOINT" </dev/null 2>/dev/null | \
 	openssl x509 -outform PEM -out /usr/local/share/ca-certificates/s3_server_cert.crt || \
-	exit -1
+	exit 1
 
     # Load the certificate in the system
     update-ca-certificates --fresh >/dev/null
@@ -191,7 +191,6 @@ function main()
         echo -n "($i/$count) Running $sdk_name tests ... "
         if ! run_test "$sdk_dir"; then
             (( i-- ))
-            break
         fi
     done
 
diff --git a/mint/preinstall.sh b/mint/preinstall.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-#  Mint (C) 2017 Minio, Inc.
+#  Mint (C) 2017-2020 Minio, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -26,13 +26,19 @@ fi
 
 $APT install apt-transport-https
 
-wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
+if ! $WGET --output-document=packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb | bash -; then
+    echo "unable to download dotnet packages"
+    exit 1
+fi
+
 dpkg -i packages-microsoft-prod.deb
 rm -f packages-microsoft-prod.deb
+
 $APT update
+$APT install gnupg ca-certificates
 
 # download and install golang
-GO_VERSION="1.13.5"
+GO_VERSION="1.13.10"
 GO_INSTALL_PATH="/usr/local"
 download_url="https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz"
 if ! $WGET --output-document=- "$download_url" | tar -C "${GO_INSTALL_PATH}" -zxf -; then
@@ -42,7 +48,9 @@ fi
 
 xargs --arg-file="${MINT_ROOT_DIR}/install-packages.list" apt --quiet --yes install
 
-# set python 3.5 as default
-update-alternatives --install /usr/bin/python python /usr/bin/python3.5 1
+nuget update -self
+
+# set python 3.6 as default
+update-alternatives --install /usr/bin/python python /usr/bin/python3.6 1
 
 sync
diff --git a/mint/remove-packages.list b/mint/remove-packages.list
@@ -3,7 +3,7 @@ git
 python3-pip
 ruby-dev
 ruby-bundler
-default-jdk
+openjdk-8-jdk
 ant
 dotnet
 nuget
diff --git a/mint/run/core/aws-sdk-go/run.sh b/mint/run/core/aws-sdk-go/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/aws-sdk-java/run.sh b/mint/run/core/aws-sdk-java/run.sh
@@ -18,13 +18,13 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
 error_log_file="$2"
 
 # run tests
-cd /mint/run/core/aws-sdk-java/ || exit -1
+cd /mint/run/core/aws-sdk-java/ || exit 1
 
 java -jar FunctionalTests.jar 1>>"$output_log_file" 2>"$error_log_file"
diff --git a/mint/run/core/aws-sdk-php/run.sh b/mint/run/core/aws-sdk-php/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/aws-sdk-ruby/run.sh b/mint/run/core/aws-sdk-ruby/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/awscli/run.sh b/mint/run/core/awscli/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/healthcheck/run.sh b/mint/run/core/healthcheck/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/mc/run.sh b/mint/run/core/mc/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/minio-dotnet/run.sh b/mint/run/core/minio-dotnet/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/minio-go/run.sh b/mint/run/core/minio-go/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/minio-java/run.sh b/mint/run/core/minio-java/run.sh
@@ -18,7 +18,7 @@
 # handle command line arguments
 if [ $# -ne 2 ]; then
     echo "usage: run.sh <OUTPUT-LOG-FILE> <ERROR-LOG-FILE>"
-    exit -1
+    exit 1
 fi
 
 output_log_file="$1"
diff --git a/mint/run/core/minio-js/run.sh b/mint/run/core/minio-js/run.sh
diff --git a/mint/run/core/minio-py/run.sh b/mint/run/core/minio-py/run.sh
diff --git a/mint/run/core/s3cmd/run.sh b/mint/run/core/s3cmd/run.sh
diff --git a/mint/run/core/s3select/run.sh b/mint/run/core/s3select/run.sh
diff --git a/mint/run/core/security/run.sh b/mint/run/core/security/run.sh
diff --git a/mint/run/core/worm/run.sh b/mint/run/core/worm/run.sh

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/bash -e`
`2`	`2`	`#`
`3`		`-# Mint (C) 2017 Minio, Inc.`
	`3`	`+# Mint (C) 20172-2020 Minio, Inc.`
`4`	`4`	`#`
`5`	`5`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`# you may not use this file except in compliance with the License.`
`@@ -15,4 +15,4 @@`
`15`	`15`	`# limitations under the License.`
`16`	`16`	`#`
`17`	`17`
`18`		`-gem install --no-rdoc --no-ri aws-sdk-resources:3.56.0 aws-sdk multipart_body`
	`18`	`+gem install --no-rdoc --no-ri aws-sdk-resources aws-sdk multipart_body`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`	`#`
`3`		`-# Mint (C) 2017 Minio, Inc.`
	`3`	`+# Mint (C) 2017-2020 Minio, Inc.`
`4`	`4`	`#`
`5`	`5`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`# you may not use this file except in compliance with the License.`
`@@ -39,4 +39,4 @@ rm -fr "${temp_dir}"`
`39`	`39`
`40`	`40`	`cd "$MINIO_DOTNET_SDK_PATH"`
`41`	`41`	`dotnet restore /p:Configuration=Mint`
`42`		`-dotnet publish --runtime ubuntu.16.04-x64 --output out /p:Configuration=Mint`
	`42`	`+dotnet publish --runtime ubuntu.18.04-x64 --output out /p:Configuration=Mint`