commit c72dd526a7ac961a0b64e4831e706e317a87e0fa
author Michael Suo <suo@fb.com> Tue Dec 10 20:23:35 2019 -0800
committer Facebook Github Bot <facebook-github-bot@users.noreply.github.com> Tue Dec 10 20:25:42 2019 -0800
tree 25356dbff4cad9d6d72461989a328077532aca9a
parent 9f3fe782392496f98ab78aaa193549ead6b76b8d

kill py2 onnx builds

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/31082

Differential Revision: D18922689

Pulled By: suo

fbshipit-source-id: 98c91b90ee3b1dd13c6020597a0ace741a1597da

.circleci/cimodel/data/caffe2_build_data.py

diff --git a/.circleci/cimodel/data/caffe2_build_data.py b/.circleci/cimodel/data/caffe2_build_data.py
index 4feef4e..f8a7af2 100644
--- a/.circleci/cimodel/data/caffe2_build_data.py
+++ b/.circleci/cimodel/data/caffe2_build_data.py
@@ -1,10 +1,10 @@
-from cimodel.lib.conf_tree import ConfigNode, XImportant
+from cimodel.lib.conf_tree import ConfigNode, XImportant, X
 from cimodel.lib.conf_tree import Ver
 
 
 CONFIG_TREE_DATA = [
     (Ver("ubuntu", "16.04"), [
-        ([Ver("gcc", "5")], [XImportant("onnx_py2")]),
+        ([Ver("gcc", "5")], [X("onnx_py3.6")]),
         ([Ver("clang", "7")], [XImportant("onnx_py3.6")]),
     ]),
 ]

.circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 38ee5d1..7786855 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2042,18 +2042,28 @@
           docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:405"
           resource_class: large
       - caffe2_linux_build:
-          name: caffe2_onnx_py2_gcc5_ubuntu16_04_build
+          name: caffe2_onnx_py3_6_gcc5_ubuntu16_04_build
           requires:
             - setup
-          build_environment: "caffe2-onnx-py2-gcc5-ubuntu16.04-build"
-          docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:345"
+          filters:
+            branches:
+              only:
+                - master
+                - /ci-all\/.*/
+          build_environment: "caffe2-onnx-py3.6-gcc5-ubuntu16.04-build"
+          docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py3.6-gcc5-ubuntu16.04:345"
       - caffe2_linux_test:
-          name: caffe2_onnx_py2_gcc5_ubuntu16_04_test
+          name: caffe2_onnx_py3_6_gcc5_ubuntu16_04_test
           requires:
             - setup
-            - caffe2_onnx_py2_gcc5_ubuntu16_04_build
-          build_environment: "caffe2-onnx-py2-gcc5-ubuntu16.04-test"
-          docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:345"
+            - caffe2_onnx_py3_6_gcc5_ubuntu16_04_build
+          filters:
+            branches:
+              only:
+                - master
+                - /ci-all\/.*/
+          build_environment: "caffe2-onnx-py3.6-gcc5-ubuntu16.04-test"
+          docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py3.6-gcc5-ubuntu16.04:345"
           resource_class: large
       - caffe2_linux_build:
           name: caffe2_onnx_py3_6_clang7_ubuntu16_04_build