Changeset 248510c in trunk
- Timestamp:
- 2019-06-26T18:29:24Z (6 years ago)
- 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)
- Files:
-
- 2 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified .circleci/Dockerfile.centos ¶
r23e3605 r248510c 24 24 COPY . ${BUILD_SRC_ROOT} 25 25 26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" 26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7" -
TabularUnified .circleci/Dockerfile.debian ¶
r23e3605 r248510c 24 24 COPY . ${BUILD_SRC_ROOT} 25 25 26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" 26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7" 27 27 28 28 # Only the integration tests currently need this but it doesn't hurt to always -
TabularUnified .circleci/Dockerfile.fedora ¶
r23e3605 r248510c 24 24 COPY . ${BUILD_SRC_ROOT} 25 25 26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" 26 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7" -
TabularUnified .circleci/Dockerfile.slackware ¶
r23e3605 r248510c 47 47 COPY . ${BUILD_SRC_ROOT} 48 48 49 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" 49 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7" -
TabularUnified .circleci/Dockerfile.ubuntu ¶
r23e3605 r248510c 27 27 COPY . ${BUILD_SRC_ROOT} 28 28 29 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" 29 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "python2.7" -
TabularUnified .circleci/config.yml ¶
r23e3605 r248510c 25 25 26 26 - "slackware-14.2" 27 28 # Test against PyPy 2.7/7.1.1 29 - "pypy2.7-7.1" 27 30 28 31 # Other assorted tasks and configurations … … 60 63 - "build-image-centos-7" 61 64 - "build-image-slackware-14.2" 65 - "build-image-pypy-2.7-7.1.1-jessie" 62 66 63 67 … … 86 90 87 91 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" 88 96 # Tell Hypothesis which configuration we want it to use. 89 97 TAHOE_LAFS_HYPOTHESIS_PROFILE: "ci" … … 92 100 LANG: "en_US.UTF-8" 93 101 # Select a tox environment to run for this job. 94 TAHOE_LAFS_TOX_ENVIRONMENT: " coverage"102 TAHOE_LAFS_TOX_ENVIRONMENT: "py27-coverage" 95 103 # Additional arguments to pass to tox. 96 104 TAHOE_LAFS_TOX_ARGS: "" … … 124 132 "/tmp/venv" \ 125 133 "/tmp/project" \ 134 "${ALLOWED_FAILURE}" \ 126 135 "${ARTIFACTS_OUTPUT_PATH}" \ 127 136 "${TAHOE_LAFS_TOX_ENVIRONMENT}" \ … … 156 165 - image: "tahoelafsci/debian:8" 157 166 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" 158 179 159 180 … … 407 428 DISTRO: "slackware" 408 429 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 14 14 shift 15 15 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. 18 PYTHON="$1" 19 shift 20 16 21 # Set up the virtualenv as a non-root user so we can run the test suite as a 17 22 # non-root user. See below. 18 virtualenv --python python2.7"${BOOTSTRAP_VENV}"23 virtualenv --python "${PYTHON}" "${BOOTSTRAP_VENV}" 19 24 20 25 # For convenience. -
TabularUnified .circleci/prepare-image.sh ¶
r23e3605 r248510c 19 19 shift 20 20 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. 23 PYTHON="$1" 24 shift 25 21 26 "${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}" 27 sudo --set-home -u nobody "${PROJECT_ROOT}"/.circleci/create-virtualenv.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}" "${PYTHON}" 23 28 sudo --set-home -u nobody "${PROJECT_ROOT}"/.circleci/populate-wheelhouse.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}" "${PROJECT_ROOT}" -
TabularUnified .circleci/run-tests.sh ¶
r23e3605 r248510c 12 12 # know what wheels to get/build, of course. 13 13 PROJECT_ROOT="$1" 14 shift 15 16 ALLOWED_FAILURE="$1" 14 17 shift 15 18 … … 55 58 export PIP_NO_INDEX="1" 56 59 60 if [ "${ALLOWED_FAILURE}" = "yes" ]; then 61 alternative="true" 62 else 63 alternative="false" 64 fi 65 57 66 ${BOOTSTRAP_VENV}/bin/tox \ 58 67 -c ${PROJECT_ROOT}/tox.ini \ 59 68 --workdir /tmp/tahoe-lafs.tox \ 60 69 -e "${TAHOE_LAFS_TOX_ENVIRONMENT}" \ 61 ${TAHOE_LAFS_TOX_ARGS} 70 ${TAHOE_LAFS_TOX_ARGS} || "${alternative}" 62 71 63 72 if [ -n "${ARTIFACTS}" ]; then 64 73 # Create a junitxml results area. 65 74 mkdir -p "$(dirname "${JUNITXML}")" 66 ${BOOTSTRAP_VENV}/bin/subunit2junitxml < "${SUBUNIT2}" > "${JUNITXML}" 75 ${BOOTSTRAP_VENV}/bin/subunit2junitxml < "${SUBUNIT2}" > "${JUNITXML}" || "${alternative}" 67 76 fi -
TabularUnified tox.ini ¶
r23e3605 r248510c 8 8 9 9 [tox] 10 envlist = py2710 envlist = {py27,pypy27}{-coverage,} 11 11 minversion = 2.4 12 12
Note: See TracChangeset
for help on using the changeset viewer.