From 310c36e319cdaaec75a12e47f8599e82076ddadd Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Wed, 8 Jul 2020 17:19:27 +0530
Subject: [PATCH] ci: separate the cephfs and rbd tests

As the maximum time allocated for the Travis
CI is 50 minutes and the cephfs and rbd E2E
takes around 45 Minutes to run completely.
This is blocking us from adding more tests in E2E.
splitting out the E2E will help us to run more tests
for each driver as we will get 50 minutes for
each Travis CI instance.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
---
 .travis.yml | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd058e143..e2cc5f1ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,25 +95,52 @@ jobs:
         - ./scripts/build-multi-arch-image.sh || travis_terminate 1;
 
     - stage: e2e testing
-      name: cephcsi with kube 1.16.9
+      name: CephFS with kubernetes v1.16.9
       script:
         - scripts/skip-doc-change.sh || travis_terminate 0;
         - make image-cephcsi || travis_terminate 1;
-        - scripts/travis-functest.sh v1.16.9 || travis_terminate 1;
+        - scripts/travis-functest.sh v1.16.9 --test-cephfs=true
+          --test-rbd=false || travis_terminate 1;
 
     - stage: e2e testing
-      name: cephcsi with kube 1.17.5
+      name: RBD with kubernetes v1.16.9
       script:
         - scripts/skip-doc-change.sh || travis_terminate 0;
         - make image-cephcsi || travis_terminate 1;
-        - scripts/travis-functest.sh v1.17.5 || travis_terminate 1;
+        - scripts/travis-functest.sh v1.16.9 --test-cephfs=false
+          --test-rbd=true || travis_terminate 1;
 
     - stage: e2e testing
-      name: cephcsi helm charts with kube 1.17.5
+      name: CephFS with kubernetes v1.17.5
       script:
         - scripts/skip-doc-change.sh || travis_terminate 0;
         - make image-cephcsi || travis_terminate 1;
-        - scripts/travis-helmtest.sh v1.17.5 || travis_terminate 1;
+        - scripts/travis-functest.sh v1.17.5 --test-cephfs=true
+          --test-rbd=false|| travis_terminate 1;
+
+    - stage: e2e testing
+      name: RBD with kubernetes v1.17.5
+      script:
+        - scripts/skip-doc-change.sh || travis_terminate 0;
+        - make image-cephcsi || travis_terminate 1;
+        - scripts/travis-functest.sh v1.17.5 --test-cephfs=false
+          --test-rbd=true || travis_terminate 1;
+
+    - stage: e2e testing
+      name: CephFS helm charts with kubernetes v1.17.5
+      script:
+        - scripts/skip-doc-change.sh || travis_terminate 0;
+        - make image-cephcsi || travis_terminate 1;
+        - scripts/travis-helmtest.sh v1.17.5 --test-cephfs=true
+          --test-rbd=false || travis_terminate 1;
+
+    - stage: e2e testing
+      name: RBD helm charts with kubernetes v1.17.5
+      script:
+        - scripts/skip-doc-change.sh || travis_terminate 0;
+        - make image-cephcsi || travis_terminate 1;
+        - scripts/travis-helmtest.sh v1.17.5 --test-cephfs=false
+          --test-rbd=true || travis_terminate 1;
 
     - stage: deploy
       name: push artifacts to repositories