From 28f74061a3f493d7742239224755bd40966acd39 Mon Sep 17 00:00:00 2001 From: Dwight Hubbard <254983+dwighthubbard@users.noreply.github.com> Date: Fri, 20 Dec 2019 09:26:49 -0800 Subject: [PATCH] Update screwdriver.yaml (#136) * Update screwdriver.yaml Add manylinux1 support and run functional tests against manylinux1, manylinux2010 and manylinux2014 packages * Create 137.feature.md * Update screwdriver.yaml * Update index.rst * Create changelog.md * Update screwdriver.yaml * Update screwdriver.yaml Publish with the correct image --- changelog.d/137.feature.md | 1 + docs/source/index.rst | 1 + docs/source/topic/changelog.md | 1 + screwdriver.yaml | 66 ++++++++++++++++++++++++++++------ 4 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 changelog.d/137.feature.md create mode 100644 docs/source/topic/changelog.md diff --git a/changelog.d/137.feature.md b/changelog.d/137.feature.md new file mode 100644 index 0000000..611fd8e --- /dev/null +++ b/changelog.d/137.feature.md @@ -0,0 +1 @@ +Add build of manylinux1 compatible wheels to the CI/CD Pipeline diff --git a/docs/source/index.rst b/docs/source/index.rst index f5a663d..1257311 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -23,6 +23,7 @@ Table of Contents topic/command_line topic/contributing + topic/changelog Indices and tables diff --git a/docs/source/topic/changelog.md b/docs/source/topic/changelog.md new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/docs/source/topic/changelog.md @@ -0,0 +1 @@ + diff --git a/screwdriver.yaml b/screwdriver.yaml index 6cba8aa..337b247 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -1,6 +1,7 @@ version: 4 shared: environment: + CHANGELOG_FILENAME: docs/source/topic/changelog.md PACKAGE_DIRECTORY: redislite jobs: @@ -22,14 +23,22 @@ jobs: DOCUMENTATION_PUBLISH: False requires: [~commit, ~pr] - package_sdist: + pkg_sdist: template: python/package_python environment: PACKAGE_TYPES: sdist PUBLISH: False requires: [~commit, ~pr] - package_manylinux2010: + pkg_ml1_64: + template: python/package_python + image: manylinux1_64 + environment: + PACKAGE_TYPES: wheel + PUBLISH: False + requires: [~commit, ~pr] + + pkg_ml2010: template: python/package_python image: manylinux2010 environment: @@ -37,7 +46,7 @@ jobs: PUBLISH: False requires: [~commit, ~pr] - package_manylinux2014: + pkg_ml2014: template: python/package_python image: manylinux2014 environment: @@ -55,9 +64,19 @@ jobs: PACKAGE_TAG: False PUBLISH: True TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/ - requires: [validate_test, validate_lint, validate_codestyle, package_sdist, validate_documentation, package_manylinux2010, package_manylinux2014, generate_version] + requires: [validate_test, validate_lint, validate_codestyle, validate_documentation, pkg_sdist, pkg_ml1_64, pkg_ml2010, pkg_ml2014, generate_version] + + publish_test_pypi_ml1: + template: python/package_python + image: manylinux1_64 + environment: + PACKAGE_TAG: False + PACKAGE_TYPES: wheel + PUBLISH: True + TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/ + requires: [validate_test, validate_lint, validate_codestyle, validate_documentation, pkg_sdist, pkg_ml1_64, pkg_ml2010, pkg_ml2014, generate_version] - publish_test_pypi_manylinux2014: + publish_test_pypi_ml2014: template: python/package_python image: manylinux2014 environment: @@ -65,29 +84,54 @@ jobs: PACKAGE_TYPES: wheel PUBLISH: True TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/ - requires: [validate_test, validate_lint, validate_codestyle, package_sdist, validate_documentation, package_manylinux2010, package_manylinux2014, generate_version] + requires: [validate_test, validate_lint, validate_codestyle, validate_documentation, pkg_sdist, pkg_ml1_64, pkg_ml2010, pkg_ml2014, generate_version] - verify_test_package: + verify_test_pkg: template: python/validate_pypi_package environment: PYPI_INDEX_URL: https://test.pypi.org/simple requires: [publish_test_pypi] + verify_test_pkg_ml1: + template: python/validate_pypi_package + image: manylinux1_64 + environment: + PYPI_INDEX_URL: https://test.pypi.org/simple + requires: [publish_test_pypi_ml1] + + verify_test_pkg_ml2014: + template: python/validate_pypi_package + image: manylinux2014 + environment: + PYPI_INDEX_URL: https://test.pypi.org/simple + requires: [publish_test_pypi_ml2014] + publish_documentation: template: python/documentation - requires: [verify_test_package] + requires: [verify_test_pkg, verify_test_pkg_ml1, verify_test_pkg_ml2014] publish_pypi: + # This template runs in a manylinux2010 container and + # publishes manylinux2010 wheels template: python/package_python environment: PUBLISH: True - requires: [verify_test_package] + requires: [verify_test_pkg, verify_test_pkg_ml1, verify_test_pkg_ml2014] - publish_pypi_manylinux2014: + publish_pypi_ml1_64: + template: python/package_python + image: manylinux1_64 + environment: + PACKAGE_TAG: False + PACKAGE_TYPES: wheel + PUBLISH: True + requires: [verify_test_pkg, verify_test_pkg_ml1, verify_test_pkg_ml2014] + + publish_pypi_ml2014: template: python/package_python image: manylinux2014 environment: PACKAGE_TAG: False PACKAGE_TYPES: wheel PUBLISH: True - requires: [verify_test_package] + requires: [verify_test_pkg, verify_test_pkg_ml1, verify_test_pkg_ml2014]