diff --git a/.pfnci/config.pbtxt b/.pfnci/config.pbtxt index 587921200c..feb03bd8e2 100644 --- 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 index bdff5c4eab..fed9753d50 100644 --- 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'))