From 73b5324b920e69bcb42703a7e142e7da97e79473 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Tue, 3 Dec 2019 13:53:33 -0800 Subject: [PATCH 1/7] Update test_docs_example.py --- src/python/tests_extended/test_docs_example.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/python/tests_extended/test_docs_example.py b/src/python/tests_extended/test_docs_example.py index d60d4c34..552bbdf2 100644 --- a/src/python/tests_extended/test_docs_example.py +++ b/src/python/tests_extended/test_docs_example.py @@ -85,10 +85,7 @@ def get_examples(): examples = [] for folder, name in folder_files: - if name in [ - '__init__.py', - # Bug todo: CustomStopWordsRemover fails on ML.NET side - 'NGramFeaturizer2.py']: + if name in ['__init__.py',]: continue # skip for all linux tests, mac is ok if os.name == "posix" and platform.linux_distribution()[0] != '': From 3f2b8a32fce93749c0d40faf2725d4809b11716d Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Tue, 3 Dec 2019 14:48:58 -0800 Subject: [PATCH 2/7] Temporary change so that extended tests can be run by PRs --- build/vsts-ci.yml | 83 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 63 insertions(+), 20 deletions(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 596e48d2..e63127fe 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -1,28 +1,28 @@ phases: -- template: signed_build_phase.yml - parameters: - name: Build_windows_RlsWinPy3_7 - config: RlsWinPy3.7 -- template: signed_build_phase.yml - parameters: - name: Build_windows_RlsWinPy3_6 - config: RlsWinPy3.6 -- template: signed_build_phase.yml - parameters: - name: Build_windows_RlsWinPy3_5 - config: RlsWinPy3.5 -- template: signed_build_phase.yml + +# Build all configurations for Windows +- template: /build/ci/phase-template.yml parameters: - name: Build_windows_RlsWinPy2_7 - config: RlsWinPy2.7 + name: Windows + buildScript: build.cmd + buildMatrix: + Py37: + _configuration: RlsWinPy3.7 + Py36: + _configuration: RlsWinPy3.6 + Py35: + _configuration: RlsWinPy3.5 + Py27: + _configuration: RlsWinPy2.7 + buildQueue: + name: Hosted VS2017 + testOptions: --includeExtendedTests -# Build all configurations for Linux - # Run tests on Ubuntu16 +# Build all configurations for Mac - template: /build/ci/phase-template.yml parameters: name: Mac buildScript: ./build.sh - testDistro: noTests buildMatrix: Py37: _configuration: RlsMacPy3.7 @@ -34,11 +34,53 @@ phases: _configuration: RlsMacPy2.7 buildQueue: name: Hosted macOS + testOptions: --includeExtendedTests + +# Build all configurations for Linux + # Run tests on Ubuntu16 - template: /build/ci/phase-template.yml parameters: name: Linux_Ubuntu16 buildScript: ./build.sh - testDistro: noTests + testDistro: ubuntu16 + buildMatrix: + Py37: + _configuration: RlsLinPy3.7 + Py36: + _configuration: RlsLinPy3.6 + Py35: + _configuration: RlsLinPy3.5 + Py27: + _configuration: RlsLinPy2.7 + buildQueue: + name: Hosted Ubuntu 1604 + testOptions: --includeExtendedTests + + # Run tests on Ubuntu14 +- template: /build/ci/phase-template.yml + parameters: + name: Linux_Ubuntu14 + buildScript: ./build.sh + testDistro: ubuntu14 + buildMatrix: + Py37: + _configuration: RlsLinPy3.7 + Py36: + _configuration: RlsLinPy3.6 + Py35: + _configuration: RlsLinPy3.5 + Py27: + _configuration: RlsLinPy2.7 + buildQueue: + name: Hosted Ubuntu 1604 + testOptions: --includeExtendedTests + + # Run tests on CentOS7 +- template: /build/ci/phase-template.yml + parameters: + name: Linux_CentOS7 + buildScript: ./build.sh + testDistro: centos7 buildMatrix: Py37: _configuration: RlsLinPy3.7 @@ -49,4 +91,5 @@ phases: Py27: _configuration: RlsLinPy2.7 buildQueue: - name: Hosted Ubuntu 1604 \ No newline at end of file + name: Hosted Ubuntu 1604 + testOptions: --includeExtendedTests From 195afce961becb977eb6cdba0f22bc8c357cad54 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Tue, 3 Dec 2019 14:50:34 -0800 Subject: [PATCH 3/7] Revert "Temporary change so that extended tests can be run by PRs" This reverts commit 3f2b8a32fce93749c0d40faf2725d4809b11716d. --- build/vsts-ci.yml | 83 ++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 63 deletions(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index e63127fe..596e48d2 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -1,28 +1,28 @@ phases: - -# Build all configurations for Windows -- template: /build/ci/phase-template.yml +- template: signed_build_phase.yml parameters: - name: Windows - buildScript: build.cmd - buildMatrix: - Py37: - _configuration: RlsWinPy3.7 - Py36: - _configuration: RlsWinPy3.6 - Py35: - _configuration: RlsWinPy3.5 - Py27: - _configuration: RlsWinPy2.7 - buildQueue: - name: Hosted VS2017 - testOptions: --includeExtendedTests + name: Build_windows_RlsWinPy3_7 + config: RlsWinPy3.7 +- template: signed_build_phase.yml + parameters: + name: Build_windows_RlsWinPy3_6 + config: RlsWinPy3.6 +- template: signed_build_phase.yml + parameters: + name: Build_windows_RlsWinPy3_5 + config: RlsWinPy3.5 +- template: signed_build_phase.yml + parameters: + name: Build_windows_RlsWinPy2_7 + config: RlsWinPy2.7 -# Build all configurations for Mac +# Build all configurations for Linux + # Run tests on Ubuntu16 - template: /build/ci/phase-template.yml parameters: name: Mac buildScript: ./build.sh + testDistro: noTests buildMatrix: Py37: _configuration: RlsMacPy3.7 @@ -34,53 +34,11 @@ phases: _configuration: RlsMacPy2.7 buildQueue: name: Hosted macOS - testOptions: --includeExtendedTests - -# Build all configurations for Linux - # Run tests on Ubuntu16 - template: /build/ci/phase-template.yml parameters: name: Linux_Ubuntu16 buildScript: ./build.sh - testDistro: ubuntu16 - buildMatrix: - Py37: - _configuration: RlsLinPy3.7 - Py36: - _configuration: RlsLinPy3.6 - Py35: - _configuration: RlsLinPy3.5 - Py27: - _configuration: RlsLinPy2.7 - buildQueue: - name: Hosted Ubuntu 1604 - testOptions: --includeExtendedTests - - # Run tests on Ubuntu14 -- template: /build/ci/phase-template.yml - parameters: - name: Linux_Ubuntu14 - buildScript: ./build.sh - testDistro: ubuntu14 - buildMatrix: - Py37: - _configuration: RlsLinPy3.7 - Py36: - _configuration: RlsLinPy3.6 - Py35: - _configuration: RlsLinPy3.5 - Py27: - _configuration: RlsLinPy2.7 - buildQueue: - name: Hosted Ubuntu 1604 - testOptions: --includeExtendedTests - - # Run tests on CentOS7 -- template: /build/ci/phase-template.yml - parameters: - name: Linux_CentOS7 - buildScript: ./build.sh - testDistro: centos7 + testDistro: noTests buildMatrix: Py37: _configuration: RlsLinPy3.7 @@ -91,5 +49,4 @@ phases: Py27: _configuration: RlsLinPy2.7 buildQueue: - name: Hosted Ubuntu 1604 - testOptions: --includeExtendedTests + name: Hosted Ubuntu 1604 \ No newline at end of file From e9c1f5bd78a67c39f980e6609491ebc43694ab75 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Tue, 3 Dec 2019 14:51:14 -0800 Subject: [PATCH 4/7] Temporary change to be able to view extended tests' status with manual PRs --- .vsts-ci.yml | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b217ab07..e63127fe 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -16,6 +16,7 @@ phases: _configuration: RlsWinPy2.7 buildQueue: name: Hosted VS2017 + testOptions: --includeExtendedTests # Build all configurations for Mac - template: /build/ci/phase-template.yml @@ -25,8 +26,15 @@ phases: buildMatrix: Py37: _configuration: RlsMacPy3.7 + Py36: + _configuration: RlsMacPy3.6 + Py35: + _configuration: RlsMacPy3.5 + Py27: + _configuration: RlsMacPy2.7 buildQueue: name: Hosted macOS + testOptions: --includeExtendedTests # Build all configurations for Linux # Run tests on Ubuntu16 @@ -40,8 +48,33 @@ phases: _configuration: RlsLinPy3.7 Py36: _configuration: RlsLinPy3.6 + Py35: + _configuration: RlsLinPy3.5 + Py27: + _configuration: RlsLinPy2.7 buildQueue: name: Hosted Ubuntu 1604 + testOptions: --includeExtendedTests + + # Run tests on Ubuntu14 +- template: /build/ci/phase-template.yml + parameters: + name: Linux_Ubuntu14 + buildScript: ./build.sh + testDistro: ubuntu14 + buildMatrix: + Py37: + _configuration: RlsLinPy3.7 + Py36: + _configuration: RlsLinPy3.6 + Py35: + _configuration: RlsLinPy3.5 + Py27: + _configuration: RlsLinPy2.7 + buildQueue: + name: Hosted Ubuntu 1604 + testOptions: --includeExtendedTests + # Run tests on CentOS7 - template: /build/ci/phase-template.yml parameters: @@ -49,7 +82,14 @@ phases: buildScript: ./build.sh testDistro: centos7 buildMatrix: + Py37: + _configuration: RlsLinPy3.7 + Py36: + _configuration: RlsLinPy3.6 + Py35: + _configuration: RlsLinPy3.5 Py27: _configuration: RlsLinPy2.7 buildQueue: - name: Hosted Ubuntu 1604 \ No newline at end of file + name: Hosted Ubuntu 1604 + testOptions: --includeExtendedTests From c44abe0eff5705c3ca083800e4216f4127845059 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 20 Dec 2019 02:58:36 -0800 Subject: [PATCH 5/7] Update .vsts-ci.yml --- .vsts-ci.yml | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e63127fe..86d7d071 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -16,7 +16,6 @@ phases: _configuration: RlsWinPy2.7 buildQueue: name: Hosted VS2017 - testOptions: --includeExtendedTests # Build all configurations for Mac - template: /build/ci/phase-template.yml @@ -26,15 +25,8 @@ phases: buildMatrix: Py37: _configuration: RlsMacPy3.7 - Py36: - _configuration: RlsMacPy3.6 - Py35: - _configuration: RlsMacPy3.5 - Py27: - _configuration: RlsMacPy2.7 buildQueue: name: Hosted macOS - testOptions: --includeExtendedTests # Build all configurations for Linux # Run tests on Ubuntu16 @@ -48,33 +40,8 @@ phases: _configuration: RlsLinPy3.7 Py36: _configuration: RlsLinPy3.6 - Py35: - _configuration: RlsLinPy3.5 - Py27: - _configuration: RlsLinPy2.7 - buildQueue: - name: Hosted Ubuntu 1604 - testOptions: --includeExtendedTests - - # Run tests on Ubuntu14 -- template: /build/ci/phase-template.yml - parameters: - name: Linux_Ubuntu14 - buildScript: ./build.sh - testDistro: ubuntu14 - buildMatrix: - Py37: - _configuration: RlsLinPy3.7 - Py36: - _configuration: RlsLinPy3.6 - Py35: - _configuration: RlsLinPy3.5 - Py27: - _configuration: RlsLinPy2.7 buildQueue: name: Hosted Ubuntu 1604 - testOptions: --includeExtendedTests - # Run tests on CentOS7 - template: /build/ci/phase-template.yml parameters: @@ -82,14 +49,7 @@ phases: buildScript: ./build.sh testDistro: centos7 buildMatrix: - Py37: - _configuration: RlsLinPy3.7 - Py36: - _configuration: RlsLinPy3.6 - Py35: - _configuration: RlsLinPy3.5 Py27: _configuration: RlsLinPy2.7 buildQueue: name: Hosted Ubuntu 1604 - testOptions: --includeExtendedTests From 0ff178201ed08d21c8dd5729b4c6cfde6d2772f4 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 20 Dec 2019 02:59:01 -0800 Subject: [PATCH 6/7] Update .vsts-ci.yml From d73f57d8b40a3ceefaf527f8c7259805430f8607 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 20 Dec 2019 03:00:35 -0800 Subject: [PATCH 7/7] Update .vsts-ci.yml --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 86d7d071..b217ab07 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -52,4 +52,4 @@ phases: Py27: _configuration: RlsLinPy2.7 buildQueue: - name: Hosted Ubuntu 1604 + name: Hosted Ubuntu 1604 \ No newline at end of file