Merge pull request #921 from Hakuyume/drop-py2-master

Drop py2.master
chainer · Aug 26, 2019 · a7bd907 · a7bd907
2 parents 60deea9 + d6d6eb0
commit a7bd907
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 127 deletions.
diff --git a/.pfnci/config.pbtxt b/.pfnci/config.pbtxt
@@ -268,133 +268,6 @@ configs {
     }
   }
 }
-configs {
-  key: "chainercv.py2.master"
-  value {
-    requirement {
-      cpu: 6
-      memory: 36
-      disk: 10
-    }
-    time_limit {
-      seconds: 3600
-    }
-    command: "sh .pfnci/tests.sh"
-    environment_variables {
-      key: "PYTHON"
-      value: "2"
-    }
-    environment_variables {
-      key: "CHAINER"
-      value: "master"
-    }
-    environment_variables {
-      key: "OPTIONAL_MODULES"
-      value: "1"
-    }
-  }
-}
-configs {
-  key: "chainercv.py2.master.gpu"
-  value {
-    requirement {
-      cpu: 4
-      memory: 24
-      disk: 10
-      gpu: 1
-    }
-    command: "sh .pfnci/tests_gpu.sh"
-    environment_variables {
-      key: "PYTHON"
-      value: "2"
-    }
-    environment_variables {
-      key: "CHAINER"
-      value: "master"
-    }
-    environment_variables {
-      key: "OPTIONAL_MODULES"
-      value: "1"
-    }
-  }
-}
-configs {
-  key: "chainercv.py2.master.mini"
-  value {
-    requirement {
-      cpu: 6
-      memory: 36
-      disk: 10
-    }
-    time_limit {
-      seconds: 3600
-    }
-    command: "sh .pfnci/tests.sh"
-    environment_variables {
-      key: "PYTHON"
-      value: "2"
-    }
-    environment_variables {
-      key: "CHAINER"
-      value: "master"
-    }
-    environment_variables {
-      key: "OPTIONAL_MODULES"
-      value: "0"
-    }
-  }
-}
-configs {
-  key: "chainercv.py2.master.mini.gpu"
-  value {
-    requirement {
-      cpu: 4
-      memory: 24
-      disk: 10
-      gpu: 1
-    }
-    command: "sh .pfnci/tests_gpu.sh"
-    environment_variables {
-      key: "PYTHON"
-      value: "2"
-    }
-    environment_variables {
-      key: "CHAINER"
-      value: "master"
-    }
-    environment_variables {
-      key: "OPTIONAL_MODULES"
-      value: "0"
-    }
-  }
-}
-configs {
-  key: "chainercv.py2.master.examples"
-  value {
-    requirement {
-      cpu: 6
-      memory: 36
-      disk: 10
-      gpu: 2
-    }
-    time_limit {
-      seconds: 1800
-    }
-    command: "sh .pfnci/examples_tests.sh"
-    environment_variables {
-      key: "PYTHON"
-      value: "2"
-    }
-    environment_variables {
-      key: "CHAINER"
-      value: "master"
-    }
-    environment_variables {
-      key: "OPTIONAL_MODULES"
-      value: "1"
-    }
-  }
-}
 configs {
   key: "chainercv.py3.stable"
   value {

diff --git a/.pfnci/gen_config.py b/.pfnci/gen_config.py
@@ -68,6 +68,8 @@ def main():
 
     for python, chainer in itertools.product(
             (2, 3), ('stable', 'latest', 'master')):
+        if python == 2 and chainer == 'master':
+            continue
         for optional in (True, False):
             configs.append(test_config(python, chainer, optional, 'cpu'))
             configs.append(test_config(python, chainer, optional, 'gpu'))