From da11dc7c40f541e645d4100c0aed5c55c3dd7647 Mon Sep 17 00:00:00 2001
From: Toru Ogawa <Hakuyume@users.noreply.github.com>
Date: Tue, 28 May 2019 03:39:54 +0900
Subject: [PATCH 1/4] cache models

---
 .pfnci/examples_tests.sh | 10 ++++++----
 .pfnci/tests.sh          |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.pfnci/examples_tests.sh b/.pfnci/examples_tests.sh
index 589e7a02bc..9ad2657b1d 100644
--- a/.pfnci/examples_tests.sh
+++ b/.pfnci/examples_tests.sh
@@ -3,10 +3,12 @@ set -eux
 
 . $(dirname $0)/common.sh
 
-apt-get install -y --no-install-recommends unzip
-gsutil -q cp gs://chainercv-pfn-public-ci/datasets-tiny.zip .
-unzip -q datasets-tiny.zip
-rm datasets-tiny.zip
+for ZIP in datasets-tiny.zip models.zip
+do
+    gsutil -q cp gs://chainercv-pfn-public-ci/${ZIP} .
+    unzip -q ${ZIP}
+    rm ${ZIP}
+done
 
 curl -L https://cloud.githubusercontent.com/assets/2062128/26187667/9cb236da-3bd5-11e7-8bcf-7dbd4302e2dc.jpg \
      -o sample.jpg
diff --git a/.pfnci/tests.sh b/.pfnci/tests.sh
index c6c75c080f..50c724c13b 100644
--- a/.pfnci/tests.sh
+++ b/.pfnci/tests.sh
@@ -4,9 +4,12 @@ set -eux
 . $(dirname $0)/common.sh
 
 apt-get install -y --no-install-recommends unzip
-gsutil -q cp gs://chainercv-pfn-public-ci/datasets-tiny.zip .
-unzip -q datasets-tiny.zip
-rm datasets-tiny.zip
+for ZIP in datasets-tiny.zip models.zip
+do
+    gsutil -q cp gs://chainercv-pfn-public-ci/${ZIP} .
+    unzip -q ${ZIP}
+    rm ${ZIP}
+done
 
 docker run --interactive --rm \
        --volume $(pwd):/root/ --workdir /root/ \

From e51dabdb66d81596f589c900293b3f7c930574be Mon Sep 17 00:00:00 2001
From: Toru Ogawa <Hakuyume@users.noreply.github.com>
Date: Tue, 28 May 2019 03:46:11 +0900
Subject: [PATCH 2/4] fix

---
 .pfnci/examples_tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pfnci/examples_tests.sh b/.pfnci/examples_tests.sh
index 9ad2657b1d..d6728b998a 100644
--- a/.pfnci/examples_tests.sh
+++ b/.pfnci/examples_tests.sh
@@ -3,6 +3,7 @@ set -eux
 
 . $(dirname $0)/common.sh
 
+apt-get install -y --no-install-recommends unzip
 for ZIP in datasets-tiny.zip models.zip
 do
     gsutil -q cp gs://chainercv-pfn-public-ci/${ZIP} .

From 9f26bfd6ae85a638a283c797fde08891d34a812e Mon Sep 17 00:00:00 2001
From: Toru Ogawa <Hakuyume@users.noreply.github.com>
Date: Tue, 28 May 2019 09:20:39 +0900
Subject: [PATCH 3/4] py2 support

---
 .pfnci/gen_config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pfnci/gen_config.py b/.pfnci/gen_config.py
index b8bb5e6c8c..5963f2184d 100644
--- a/.pfnci/gen_config.py
+++ b/.pfnci/gen_config.py
@@ -4,6 +4,7 @@
     $ python gen_config.py > config.pbtxt
 """
 
+from __future__ import print_function
 from collections import OrderedDict
 import itertools
 

From 2c8a43f31abd9cc092b17a70440918f1931d97b1 Mon Sep 17 00:00:00 2001
From: Toru Ogawa <Hakuyume@users.noreply.github.com>
Date: Tue, 28 May 2019 09:21:57 +0900
Subject: [PATCH 4/4] increase memory

---
 .pfnci/config.pbtxt  | 24 ++++++++++++------------
 .pfnci/gen_config.py |  2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.pfnci/config.pbtxt b/.pfnci/config.pbtxt
index fdfdf41600..587921200c 100644
--- a/.pfnci/config.pbtxt
+++ b/.pfnci/config.pbtxt
@@ -118,8 +118,8 @@ configs {
   key: "chainercv.py2.stable.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -245,8 +245,8 @@ configs {
   key: "chainercv.py2.latest.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -372,8 +372,8 @@ configs {
   key: "chainercv.py2.master.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -499,8 +499,8 @@ configs {
   key: "chainercv.py3.stable.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -626,8 +626,8 @@ configs {
   key: "chainercv.py3.latest.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -753,8 +753,8 @@ configs {
   key: "chainercv.py3.master.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
diff --git a/.pfnci/gen_config.py b/.pfnci/gen_config.py
index 5963f2184d..bdff5c4eab 100644
--- a/.pfnci/gen_config.py
+++ b/.pfnci/gen_config.py
@@ -40,6 +40,8 @@ def test_config(python, chainer, optional, target):
         value['command'] = 'sh .pfnci/tests_gpu.sh'
     elif target == 'examples':
         key += '.examples'
+        value['requirement']['cpu'] = 6
+        value['requirement']['memory'] = 36
         value['requirement']['gpu'] = 2
         value['time_limit'] = {'seconds': 1800}
         value['command'] = 'sh .pfnci/examples_tests.sh'