From 834be5b643caa05531b949de8aab2b781be4eb37 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 17:16:21 -0500 Subject: [PATCH 01/10] CI: move py36 slow to azure (#34776) --- .travis.yml | 6 ------ ci/azure/posix.yml | 7 +++++++ ci/deps/{travis-36-slow.yaml => azure-36-slow.yaml} | 0 3 files changed, 7 insertions(+), 6 deletions(-) rename ci/deps/{travis-36-slow.yaml => azure-36-slow.yaml} (100%) diff --git a/.travis.yml b/.travis.yml index fdea9876d5d89..b016cf386098e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,12 +58,6 @@ matrix: services: - mysql - postgresql - - - env: - - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow" SQL="1" - services: - - mysql - - postgresql allow_failures: - arch: arm64 env: diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 880fdc46f43f5..47d594114e15a 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -30,6 +30,13 @@ jobs: LC_ALL: "zh_CN.utf8" EXTRA_APT: "language-pack-zh-hans" + py36_slow: + ENV_FILE: ci/deps/azure-36-slow.yaml + CONDA_PY: "36" + PATTERN: "slow" + variables: + SQL: "1" + py36_locale: ENV_FILE: ci/deps/azure-36-locale.yaml CONDA_PY: "36" diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/azure-36-slow.yaml similarity index 100% rename from ci/deps/travis-36-slow.yaml rename to ci/deps/azure-36-slow.yaml From 839beff5fba8aebe7b05be5ba2fc16a1c27f1b7c Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 17:20:18 -0500 Subject: [PATCH 02/10] CI: move py36 slow to azure (#34776) --- ci/azure/posix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 47d594114e15a..42d2a32f600ff 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -34,8 +34,7 @@ jobs: ENV_FILE: ci/deps/azure-36-slow.yaml CONDA_PY: "36" PATTERN: "slow" - variables: - SQL: "1" + SQL: "1" py36_locale: ENV_FILE: ci/deps/azure-36-locale.yaml From 6c22a4c27f2b16fb92c8ff597017c3d89ab33e42 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 19:08:11 -0500 Subject: [PATCH 03/10] CI: install sql for Azure Pipeline --- ci/azure/posix.yml | 1 + ci/setup_env.sh | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 42d2a32f600ff..b7896d9217e8d 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -35,6 +35,7 @@ jobs: CONDA_PY: "36" PATTERN: "slow" SQL: "1" + SQL_SETUP: "1" py36_locale: ENV_FILE: ci/deps/azure-36-locale.yaml diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 4d551294dbb21..60082eeebfdce 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -160,6 +160,15 @@ conda list # Install DB for Linux if [[ -n ${SQL:0} ]]; then + + if [[ -n ${SQL_SETUP:0} ]]; then + echo "setting up SQL dbs on Azure Pipelines" + sudo apt install -y mysql-server + sudo apt install -y postgres + else + echo "" + fi + echo "installing dbs" mysql -e 'create database pandas_nosetest;' psql -c 'create database pandas_nosetest;' -U postgres From b07f57d0a9639f9da5f0f6c57e3e7fc86df24632 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 19:19:07 -0500 Subject: [PATCH 04/10] CI: install sql for Azure Pipeline --- ci/setup_env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 60082eeebfdce..bd9d85999de61 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -163,8 +163,8 @@ if [[ -n ${SQL:0} ]]; then if [[ -n ${SQL_SETUP:0} ]]; then echo "setting up SQL dbs on Azure Pipelines" - sudo apt install -y mysql-server - sudo apt install -y postgres + sudo apt-get install -y mysql-server + sudo apt-get install -y postgres else echo "" fi From eae32df7d2b48672b4423b60fd4b4753a069154a Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 20:05:33 -0500 Subject: [PATCH 05/10] CI: install sql for Azure Pipeline --- ci/setup_env.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index bd9d85999de61..3aa75fb709a0a 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -164,9 +164,13 @@ if [[ -n ${SQL:0} ]]; then if [[ -n ${SQL_SETUP:0} ]]; then echo "setting up SQL dbs on Azure Pipelines" sudo apt-get install -y mysql-server + + sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' + wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - + sudo apt-get update sudo apt-get install -y postgres else - echo "" + echo "SQL dbs not installed" fi echo "installing dbs" From dc7d704274fe0f2e0f0778257cf7968a0ea28666 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 20:27:01 -0500 Subject: [PATCH 06/10] CI: fix sql script for Azure Pipeline --- ci/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 3aa75fb709a0a..e41f2c4f8458f 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -168,7 +168,7 @@ if [[ -n ${SQL:0} ]]; then sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - sudo apt-get update - sudo apt-get install -y postgres + sudo apt-get install -y postgresql else echo "SQL dbs not installed" fi From 064bb49ea9dcb13188c7c5a9431a177b3112c8ee Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 20:44:03 -0500 Subject: [PATCH 07/10] CI: fix sql script --- ci/setup_env.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index e41f2c4f8458f..b2a1d9f057466 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -162,13 +162,9 @@ conda list if [[ -n ${SQL:0} ]]; then if [[ -n ${SQL_SETUP:0} ]]; then - echo "setting up SQL dbs on Azure Pipelines" - sudo apt-get install -y mysql-server - - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - - sudo apt-get update - sudo apt-get install -y postgresql + echo "starting up SQL dbs" + sudo services mysql start + sudo service postgresql start else echo "SQL dbs not installed" fi From 93a288d56f455deffe1aadb39d41e09a96db45e3 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 20:56:39 -0500 Subject: [PATCH 08/10] CI: fix sql script --- ci/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index b2a1d9f057466..3dc06bdf593a3 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -163,7 +163,7 @@ if [[ -n ${SQL:0} ]]; then if [[ -n ${SQL_SETUP:0} ]]; then echo "starting up SQL dbs" - sudo services mysql start + sudo service mysql start sudo service postgresql start else echo "SQL dbs not installed" From 278db2b874ef1bfd1888f5a77c46375b505d6ede Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 21:54:22 -0500 Subject: [PATCH 09/10] CI: add sql task --- ci/azure/posix.yml | 11 ++++++++++- ci/setup_env.sh | 10 ---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index b7896d9217e8d..2aed009bea923 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -34,7 +34,6 @@ jobs: ENV_FILE: ci/deps/azure-36-slow.yaml CONDA_PY: "36" PATTERN: "slow" - SQL: "1" SQL_SETUP: "1" py36_locale: @@ -81,6 +80,16 @@ jobs: - script: ci/setup_env.sh displayName: 'Setup environment and build pandas' + - task: MysqlDeploymentOnMachineGroup@1 + displayName: 'Deploy Using : InlineSqlTask' + inputs: + TaskNameSelector: InlineSqlTask + SqlInline: | + CREATE DATABASE pandas_nosetest; + ServerName: localhost + SqlUsername: root + SqlPassword: root + - script: | source activate pandas-dev ci/run_tests.sh diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 3dc06bdf593a3..aa43d8b7dd00a 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -160,20 +160,10 @@ conda list # Install DB for Linux if [[ -n ${SQL:0} ]]; then - - if [[ -n ${SQL_SETUP:0} ]]; then - echo "starting up SQL dbs" - sudo service mysql start - sudo service postgresql start - else - echo "SQL dbs not installed" - fi - echo "installing dbs" mysql -e 'create database pandas_nosetest;' psql -c 'create database pandas_nosetest;' -U postgres else echo "not using dbs on non-linux Travis builds or Azure Pipelines" fi - echo "done" From 2349c1ea527b13b3ddd9dbc066205bea0b879ae9 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Mon, 6 Jul 2020 22:05:36 -0500 Subject: [PATCH 10/10] CI: add sql task --- ci/azure/posix.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 2aed009bea923..f716974f6add1 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -34,7 +34,6 @@ jobs: ENV_FILE: ci/deps/azure-36-slow.yaml CONDA_PY: "36" PATTERN: "slow" - SQL_SETUP: "1" py36_locale: ENV_FILE: ci/deps/azure-36-locale.yaml @@ -80,16 +79,6 @@ jobs: - script: ci/setup_env.sh displayName: 'Setup environment and build pandas' - - task: MysqlDeploymentOnMachineGroup@1 - displayName: 'Deploy Using : InlineSqlTask' - inputs: - TaskNameSelector: InlineSqlTask - SqlInline: | - CREATE DATABASE pandas_nosetest; - ServerName: localhost - SqlUsername: root - SqlPassword: root - - script: | source activate pandas-dev ci/run_tests.sh