From b328ec781aee088e868a61a1ba5e9a7728237aea Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 19 Nov 2020 12:23:46 -0300 Subject: [PATCH 1/5] Add Jenkinsfile Signed-off-by: Uilian Ries --- jenkins/Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 jenkins/Jenkinsfile diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile new file mode 100644 index 00000000..05207b90 --- /dev/null +++ b/jenkins/Jenkinsfile @@ -0,0 +1,15 @@ +try { + node("Linux") { + sh(script: "python --version") + } + node("Macos") { + sh(script: "python --version") + } + node("Windows") { + bat(script: "python --version") + } +} +catch(e){ + echo "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'" + throw e +} From 8cefc0c073ff3e8dcdddd33644d8a5a3d6054404 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 19 Nov 2020 14:30:29 -0300 Subject: [PATCH 2/5] Update Jenkinsfile path Signed-off-by: Uilian Ries --- jenkins/Jenkinsfile => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkins/Jenkinsfile => Jenkinsfile (100%) diff --git a/jenkins/Jenkinsfile b/Jenkinsfile similarity index 100% rename from jenkins/Jenkinsfile rename to Jenkinsfile From 3ddb5179a055e63924d07eca74f4e20ee4a37126 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Fri, 4 Dec 2020 10:23:04 -0300 Subject: [PATCH 3/5] Execute test on Linux Signed-off-by: Uilian Ries --- .ci/appveyor/install.bat | 5 ---- .ci/appveyor/test.bat | 3 --- .ci/travis/install.sh | 36 ------------------------- .ci/travis/requirements_travis.txt | 2 -- .ci/travis/run.sh | 15 ----------- .travis.yml | 43 ------------------------------ Jenkinsfile | 15 ----------- appveyor.yml | 27 ------------------- jenkins/Jenkinsfile | 25 +++++++++++++++++ 9 files changed, 25 insertions(+), 146 deletions(-) delete mode 100644 .ci/appveyor/install.bat delete mode 100644 .ci/appveyor/test.bat delete mode 100755 .ci/travis/install.sh delete mode 100644 .ci/travis/requirements_travis.txt delete mode 100755 .ci/travis/run.sh delete mode 100644 .travis.yml delete mode 100644 Jenkinsfile delete mode 100644 appveyor.yml create mode 100644 jenkins/Jenkinsfile diff --git a/.ci/appveyor/install.bat b/.ci/appveyor/install.bat deleted file mode 100644 index 0a54b274..00000000 --- a/.ci/appveyor/install.bat +++ /dev/null @@ -1,5 +0,0 @@ -SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% -SET PYTHONPATH=%PYTHONPATH%;%CD% -SET CONAN_TEST_SUITE=1 -%PYTHON%/Scripts/pip.exe install -r cpt/requirements_test.txt -%PYTHON%/Scripts/pip.exe install -r cpt/requirements.txt diff --git a/.ci/appveyor/test.bat b/.ci/appveyor/test.bat deleted file mode 100644 index ecaaf2b3..00000000 --- a/.ci/appveyor/test.bat +++ /dev/null @@ -1,3 +0,0 @@ -conan user -mkdir %HOMEPATH%/.conan/data -nosetests cpt.test --nocapture diff --git a/.ci/travis/install.sh b/.ci/travis/install.sh deleted file mode 100755 index 2b4524f6..00000000 --- a/.ci/travis/install.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -set -e -set -x - -if [[ "$(uname -s)" == 'Darwin' ]]; then - brew update - brew install openssl readline - brew outdated pyenv || brew upgrade pyenv - brew install pyenv-virtualenv - - if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi - if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi - - case "${PYVER}" in - py27) - pyenv install 2.7.16 - pyenv virtualenv 2.7.16 conan - ;; - py37) - pyenv install 3.7.1 - pyenv virtualenv 3.7.1 conan - ;; - - esac - pyenv rehash - pyenv activate conan - - python --version -else - sudo apt-get update - sudo apt-get install -y --no-install-recommends gcc-multilib g++-multilib selinux-basics -fi - -pip install -r cpt/requirements.txt -pip install -r cpt/requirements_test.txt diff --git a/.ci/travis/requirements_travis.txt b/.ci/travis/requirements_travis.txt deleted file mode 100644 index e8998dc8..00000000 --- a/.ci/travis/requirements_travis.txt +++ /dev/null @@ -1,2 +0,0 @@ -tox-travis>=0.11 --r ../../cpt/requirements_test.txt \ No newline at end of file diff --git a/.ci/travis/run.sh b/.ci/travis/run.sh deleted file mode 100755 index 76a1c8e1..00000000 --- a/.ci/travis/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e -set -x - -if [[ "$(uname -s)" == 'Darwin' ]]; then - if which pyenv > /dev/null; then - eval "$(pyenv init -)" - fi - pyenv activate conan -fi - -conan user -mkdir ~/.conan/data -tox diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5b0501b7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,43 +0,0 @@ -sudo: false -language: python -dist: trusty - -jobs: - fast_finish: true - include: - - - stage: Conan Development - Linux - if: branch != master AND branch !~ /release*/ - python: 2.7 - env: TOXENV=py27-conan-dev - - python: 3.7 - if: branch != master AND branch !~ /release*/ - env: TOXENV=py37-conan-dev - dist: xenial - - - stage: Conan Latest - Linux - python: 2.7 - env: TOXENV=py27-conan-latest - - python: 3.7 - env: TOXENV=py37-conan-latest - dist: xenial - - - stage: Conan Latest - Macos - language: generic - os: osx - osx_image: xcode10.3 - env: PYVER=py27 TOXENV=py27-conan-latest - - language: generic - os: osx - osx_image: xcode10.3 - env: PYVER=py37 TOXENV=py37-conan-latest - - -install: - - .ci/travis/install.sh - -script: - - .ci/travis/run.sh - -after_success: - - bash <(curl -s https://codecov.io/bash) diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 05207b90..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,15 +0,0 @@ -try { - node("Linux") { - sh(script: "python --version") - } - node("Macos") { - sh(script: "python --version") - } - node("Windows") { - bat(script: "python --version") - } -} -catch(e){ - echo "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'" - throw e -} diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index a6f4ab2c..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,27 +0,0 @@ -environment: - matrix: - - PYTHON: "C:\\Python27" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - USE_UNSUPPORTED_CONAN_WITH_PYTHON_2: "1" - TOXENV: "py27-conan-dev" - - - PYTHON: "C:\\Python37" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - USE_UNSUPPORTED_CONAN_WITH_PYTHON_2: "1" - TOXENV: "py37-conan-dev" - - - PYTHON: "C:\\Python27" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - USE_UNSUPPORTED_CONAN_WITH_PYTHON_2: "1" - TOXENV: "py27-conan-latest" - - - PYTHON: "C:\\Python37" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - USE_UNSUPPORTED_CONAN_WITH_PYTHON_2: "1" - TOXENV: "py37-conan-latest" - -build: false -install: - - .ci/appveyor/install.bat -test_script: - - .ci/appveyor/test.bat diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile new file mode 100644 index 00000000..604fc656 --- /dev/null +++ b/jenkins/Jenkinsfile @@ -0,0 +1,25 @@ +try { + node("Linux") { + List pyVersions = ['2.7', '3.7'] + List conanVersions = ['conan-dev', 'conan-latest'] + + stage('CPT Linux stage') { + sh 'apt-get update' + // To build some deps from sources it needs pythonXX-dev + sh 'apt-get -y install python3-venv python3.7-venv' + sh 'pip install -r cpt/requirements_test.txt' + + def envs = sh(returnStdout: true, script: "tox -l").trim().split('\n') + def cmds = envs.collectEntries({ tox_env -> + [tox_env, { + sh "tox --parallel--safe-build -vve $tox_env" + }] + }) + parallel(cmds) + } + } +} +catch(e){ + echo "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'" + throw e +} From 43e05d504ca14517163116391d4cc796486f686c Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Fri, 4 Dec 2020 10:32:29 -0300 Subject: [PATCH 4/5] Get sources Signed-off-by: Uilian Ries --- jenkins/Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 604fc656..a844970e 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -3,6 +3,10 @@ try { List pyVersions = ['2.7', '3.7'] List conanVersions = ['conan-dev', 'conan-latest'] + stage('Get sources') { + checkout scm + } + stage('CPT Linux stage') { sh 'apt-get update' // To build some deps from sources it needs pythonXX-dev From 448be88b6606a48a3675ea2a2b635caf07186d07 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Fri, 4 Dec 2020 11:07:52 -0300 Subject: [PATCH 5/5] Simplify tests Signed-off-by: Uilian Ries --- jenkins/Jenkinsfile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index a844970e..1318c479 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,8 +1,5 @@ try { node("Linux") { - List pyVersions = ['2.7', '3.7'] - List conanVersions = ['conan-dev', 'conan-latest'] - stage('Get sources') { checkout scm } @@ -12,14 +9,9 @@ try { // To build some deps from sources it needs pythonXX-dev sh 'apt-get -y install python3-venv python3.7-venv' sh 'pip install -r cpt/requirements_test.txt' - - def envs = sh(returnStdout: true, script: "tox -l").trim().split('\n') - def cmds = envs.collectEntries({ tox_env -> - [tox_env, { - sh "tox --parallel--safe-build -vve $tox_env" - }] - }) - parallel(cmds) + // Show default environments + sh 'tox -vv -l' + sh 'tox -vv -e py37-conan-latest' } } }