From 3305d5c2f935b1512c58faad0aa770432dea6d21 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 14 Apr 2020 15:48:12 -0700 Subject: [PATCH] DO NOT MERGE, uploading RC Signed-off-by: Eli Uriegas --- .circleci/config.yml | 124 +--------------------------------------- .circleci/config.yml.in | 6 +- .circleci/regenerate.py | 2 +- 3 files changed, 6 insertions(+), 126 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b62bb37c12..d0f611e547 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -155,7 +155,7 @@ jobs: # Prevent credential from leaking conda install -yq anaconda-client set -x - anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/*.tar.bz2 -u pytorch-nightly --label main --no-progress --force + anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/*.tar.bz2 -u pytorch-test --label main --no-progress --force # Requires org-member context binary_wheel_upload: @@ -175,7 +175,7 @@ jobs: export AWS_SECRET_ACCESS_KEY="${PYTORCH_BINARY_AWS_SECRET_ACCESS_KEY}" set -x for pkg in ~/workspace/*.whl; do - aws s3 cp "$pkg" "s3://pytorch/whl/nightly/" --acl public-read + aws s3 cp "$pkg" "s3://pytorch/whl/test/" --acl public-read done smoke_test_linux_conda: @@ -298,290 +298,170 @@ workflows: jobs: - circleci_consistency - binary_linux_wheel: - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.5 python_version: '3.5' - binary_wheel_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.5_upload requires: - nightly_binary_linux_wheel_py3.5 - smoke_test_linux_pip: - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.5_smoke_test_pip python_version: '3.5' requires: - nightly_binary_linux_wheel_py3.5_upload - binary_linux_wheel: - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.6 python_version: '3.6' - binary_wheel_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.6_upload requires: - nightly_binary_linux_wheel_py3.6 - smoke_test_linux_pip: - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.6_smoke_test_pip python_version: '3.6' requires: - nightly_binary_linux_wheel_py3.6_upload - binary_linux_wheel: - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.7 python_version: '3.7' - binary_wheel_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.7_upload requires: - nightly_binary_linux_wheel_py3.7 - smoke_test_linux_pip: - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.7_smoke_test_pip python_version: '3.7' requires: - nightly_binary_linux_wheel_py3.7_upload - binary_linux_wheel: - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.8 python_version: '3.8' - binary_wheel_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.8_upload requires: - nightly_binary_linux_wheel_py3.8 - smoke_test_linux_pip: - filters: - branches: - only: nightly name: nightly_binary_linux_wheel_py3.8_smoke_test_pip python_version: '3.8' requires: - nightly_binary_linux_wheel_py3.8_upload - binary_macos_wheel: - filters: - branches: - only: nightly name: nightly_binary_macos_wheel_py3.5 python_version: '3.5' - binary_wheel_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_macos_wheel_py3.5_upload requires: - nightly_binary_macos_wheel_py3.5 - binary_macos_wheel: - filters: - branches: - only: nightly name: nightly_binary_macos_wheel_py3.6 python_version: '3.6' - binary_wheel_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_macos_wheel_py3.6_upload requires: - nightly_binary_macos_wheel_py3.6 - binary_macos_wheel: - filters: - branches: - only: nightly name: nightly_binary_macos_wheel_py3.7 python_version: '3.7' - binary_wheel_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_macos_wheel_py3.7_upload requires: - nightly_binary_macos_wheel_py3.7 - binary_macos_wheel: - filters: - branches: - only: nightly name: nightly_binary_macos_wheel_py3.8 python_version: '3.8' - binary_wheel_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_macos_wheel_py3.8_upload requires: - nightly_binary_macos_wheel_py3.8 - binary_linux_conda: - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.5 python_version: '3.5' - binary_conda_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.5_upload requires: - nightly_binary_linux_conda_py3.5 - smoke_test_linux_conda: - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.5_smoke_test_conda python_version: '3.5' requires: - nightly_binary_linux_conda_py3.5_upload - binary_linux_conda: - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.6 python_version: '3.6' - binary_conda_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.6_upload requires: - nightly_binary_linux_conda_py3.6 - smoke_test_linux_conda: - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.6_smoke_test_conda python_version: '3.6' requires: - nightly_binary_linux_conda_py3.6_upload - binary_linux_conda: - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.7 python_version: '3.7' - binary_conda_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.7_upload requires: - nightly_binary_linux_conda_py3.7 - smoke_test_linux_conda: - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.7_smoke_test_conda python_version: '3.7' requires: - nightly_binary_linux_conda_py3.7_upload - binary_linux_conda: - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.8 python_version: '3.8' - binary_conda_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.8_upload requires: - nightly_binary_linux_conda_py3.8 - smoke_test_linux_conda: - filters: - branches: - only: nightly name: nightly_binary_linux_conda_py3.8_smoke_test_conda python_version: '3.8' requires: - nightly_binary_linux_conda_py3.8_upload - binary_macos_conda: - filters: - branches: - only: nightly name: nightly_binary_macos_conda_py3.5 python_version: '3.5' - binary_conda_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_macos_conda_py3.5_upload requires: - nightly_binary_macos_conda_py3.5 - binary_macos_conda: - filters: - branches: - only: nightly name: nightly_binary_macos_conda_py3.6 python_version: '3.6' - binary_conda_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_macos_conda_py3.6_upload requires: - nightly_binary_macos_conda_py3.6 - binary_macos_conda: - filters: - branches: - only: nightly name: nightly_binary_macos_conda_py3.7 python_version: '3.7' - binary_conda_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_macos_conda_py3.7_upload requires: - nightly_binary_macos_conda_py3.7 - binary_macos_conda: - filters: - branches: - only: nightly name: nightly_binary_macos_conda_py3.8 python_version: '3.8' - binary_conda_upload: context: org-member - filters: - branches: - only: nightly name: nightly_binary_macos_conda_py3.8_upload requires: - nightly_binary_macos_conda_py3.8 diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index fb3316969a..8421da42b1 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -155,7 +155,7 @@ jobs: # Prevent credential from leaking conda install -yq anaconda-client set -x - anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/*.tar.bz2 -u pytorch-nightly --label main --no-progress --force + anaconda -t "${CONDA_PYTORCHBOT_TOKEN}" upload ~/workspace/*.tar.bz2 -u pytorch-test --label main --no-progress --force # Requires org-member context binary_wheel_upload: @@ -175,7 +175,7 @@ jobs: export AWS_SECRET_ACCESS_KEY="${PYTORCH_BINARY_AWS_SECRET_ACCESS_KEY}" set -x for pkg in ~/workspace/*.whl; do - aws s3 cp "$pkg" "s3://pytorch/whl/nightly/" --acl public-read + aws s3 cp "$pkg" "s3://pytorch/whl/test/" --acl public-read done smoke_test_linux_conda: @@ -250,7 +250,7 @@ workflows: nightly: jobs: - circleci_consistency - {{ workflows(prefix="nightly_", filter_branch="nightly", upload=True) }} + {{ workflows(prefix="nightly_", upload=True) }} docker_build: triggers: - schedule: diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 19f52be756..86cd008814 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -49,7 +49,7 @@ def workflow_pair(btype, os_type, python_version, unicode, filter_branch, prefix w.append(generate_upload_workflow(base_workflow_name, filter_branch, btype)) - if filter_branch == 'nightly' and is_py3_linux: + if is_py3_linux: pydistro = 'pip' if btype == 'wheel' else 'conda' w.append(generate_smoketest_workflow(pydistro, base_workflow_name, filter_branch, python_version))