Changeset 248510c in trunk


Ignore:
Timestamp:
2019-06-26T18:29:24Z (6 years ago)
Author:
GitHub <noreply@…>
Branches:
master
Children:
c169246
Parents:
23e3605 (diff), 10b9575 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jean-Paul Calderone <exarkun@…> (2019-06-26 18:29:24)
git-committer:
GitHub <noreply@…> (2019-06-26 18:29:24)
Message:

Merge pull request #626 from tahoe-lafs/2479.pypy-ci-again

Test against PyPy? on CI

Fixes: ticket:2479

Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified .circleci/Dockerfile.centos

    r23e3605 r248510c  
    2424COPY . ${BUILD_SRC_ROOT}
    2525
    26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
     26RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7"
  • TabularUnified .circleci/Dockerfile.debian

    r23e3605 r248510c  
    2424COPY . ${BUILD_SRC_ROOT}
    2525
    26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
     26RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7"
    2727
    2828# Only the integration tests currently need this but it doesn't hurt to always
  • TabularUnified .circleci/Dockerfile.fedora

    r23e3605 r248510c  
    2424COPY . ${BUILD_SRC_ROOT}
    2525
    26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
     26RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7"
  • TabularUnified .circleci/Dockerfile.slackware

    r23e3605 r248510c  
    4747COPY . ${BUILD_SRC_ROOT}
    4848
    49 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
     49RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7"
  • TabularUnified .circleci/Dockerfile.ubuntu

    r23e3605 r248510c  
    2727COPY . ${BUILD_SRC_ROOT}
    2828
    29 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
     29RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7"
  • TabularUnified .circleci/config.yml

    r23e3605 r248510c  
    2525
    2626      - "slackware-14.2"
     27
     28      # Test against PyPy 2.7/7.1.1
     29      - "pypy2.7-7.1"
    2730
    2831      # Other assorted tasks and configurations
     
    6063      - "build-image-centos-7"
    6164      - "build-image-slackware-14.2"
     65      - "build-image-pypy-2.7-7.1.1-jessie"
    6266
    6367
     
    8690
    8791    environment: &UTF_8_ENVIRONMENT
     92      # In general, the test suite is not allowed to fail while the job
     93      # succeeds.  But you can set this to "yes" if you want it to be
     94      # otherwise.
     95      ALLOWED_FAILURE: "no"
    8896      # Tell Hypothesis which configuration we want it to use.
    8997      TAHOE_LAFS_HYPOTHESIS_PROFILE: "ci"
     
    92100      LANG: "en_US.UTF-8"
    93101      # Select a tox environment to run for this job.
    94       TAHOE_LAFS_TOX_ENVIRONMENT: "coverage"
     102      TAHOE_LAFS_TOX_ENVIRONMENT: "py27-coverage"
    95103      # Additional arguments to pass to tox.
    96104      TAHOE_LAFS_TOX_ARGS: ""
     
    124132                "/tmp/venv" \
    125133                "/tmp/project" \
     134                "${ALLOWED_FAILURE}" \
    126135                "${ARTIFACTS_OUTPUT_PATH}" \
    127136                "${TAHOE_LAFS_TOX_ENVIRONMENT}" \
     
    156165      - image: "tahoelafsci/debian:8"
    157166        user: "nobody"
     167
     168
     169  pypy2.7-7.1:
     170    <<: *DEBIAN
     171    docker:
     172      - image: "tahoelafsci/pypy:2.7-7.1.1-jessie"
     173        user: "nobody"
     174
     175    environment:
     176      <<: *UTF_8_ENVIRONMENT
     177      TAHOE_LAFS_TOX_ENVIRONMENT: "pypy27-coverage"
     178      ALLOWED_FAILURE: "yes"
    158179
    159180
     
    407428      DISTRO: "slackware"
    408429      TAG: "14.2"
     430
     431
     432  build-image-pypy-2.7-7.1.1-jessie:
     433    <<: *BUILD_IMAGE
     434
     435    environment:
     436      DISTRO: "pypy"
     437      TAG: "2.7-7.1.1-jessie"
  • TabularUnified .circleci/create-virtualenv.sh

    r23e3605 r248510c  
    1414shift
    1515
     16# The basename of the Python executable (found on PATH) that will be used with
     17# this image.  This lets us create a virtualenv that uses the correct Python.
     18PYTHON="$1"
     19shift
     20
    1621# Set up the virtualenv as a non-root user so we can run the test suite as a
    1722# non-root user.  See below.
    18 virtualenv --python python2.7 "${BOOTSTRAP_VENV}"
     23virtualenv --python "${PYTHON}" "${BOOTSTRAP_VENV}"
    1924
    2025# For convenience.
  • TabularUnified .circleci/prepare-image.sh

    r23e3605 r248510c  
    1919shift
    2020
     21# The basename of the Python executable (found on PATH) that will be used with
     22# this image.  This lets us create a virtualenv that uses the correct Python.
     23PYTHON="$1"
     24shift
     25
    2126"${PROJECT_ROOT}"/.circleci/fix-permissions.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}" "${PROJECT_ROOT}"
    22 sudo --set-home -u nobody "${PROJECT_ROOT}"/.circleci/create-virtualenv.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}"
     27sudo --set-home -u nobody "${PROJECT_ROOT}"/.circleci/create-virtualenv.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}" "${PYTHON}"
    2328sudo --set-home -u nobody "${PROJECT_ROOT}"/.circleci/populate-wheelhouse.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}" "${PROJECT_ROOT}"
  • TabularUnified .circleci/run-tests.sh

    r23e3605 r248510c  
    1212# know what wheels to get/build, of course.
    1313PROJECT_ROOT="$1"
     14shift
     15
     16ALLOWED_FAILURE="$1"
    1417shift
    1518
     
    5558export PIP_NO_INDEX="1"
    5659
     60if [ "${ALLOWED_FAILURE}" = "yes" ]; then
     61    alternative="true"
     62else
     63    alternative="false"
     64fi
     65
    5766${BOOTSTRAP_VENV}/bin/tox \
    5867    -c ${PROJECT_ROOT}/tox.ini \
    5968    --workdir /tmp/tahoe-lafs.tox \
    6069    -e "${TAHOE_LAFS_TOX_ENVIRONMENT}" \
    61     ${TAHOE_LAFS_TOX_ARGS}
     70    ${TAHOE_LAFS_TOX_ARGS} || "${alternative}"
    6271
    6372if [ -n "${ARTIFACTS}" ]; then
    6473    # Create a junitxml results area.
    6574    mkdir -p "$(dirname "${JUNITXML}")"
    66     ${BOOTSTRAP_VENV}/bin/subunit2junitxml < "${SUBUNIT2}" > "${JUNITXML}"
     75    ${BOOTSTRAP_VENV}/bin/subunit2junitxml < "${SUBUNIT2}" > "${JUNITXML}" || "${alternative}"
    6776fi
  • TabularUnified tox.ini

    r23e3605 r248510c  
    88
    99[tox]
    10 envlist = py27
     10envlist = {py27,pypy27}{-coverage,}
    1111minversion = 2.4
    1212
Note: See TracChangeset for help on using the changeset viewer.