From 3afcf511b2fbed3457027017c8c6fbc080ea732c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Wed, 11 Jul 2018 19:30:54 -0400
Subject: [PATCH] Allow Intel CI failure, shuffle CI Python versions

---
 .gitlab-ci.yml | 52 +++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6673894..d946ecac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,43 +14,30 @@
   except:
   - tags
 
-Python 3.5 Intel CPU:
+Python 3.6 Intel CPU:
   script:
-  - export PY_EXE=python3.5
+  - export PY_EXE=python3.6
   - export PYOPENCL_TEST="intel(r):pu"
   - export EXTRA_INSTALL="numpy mako"
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
-  tags:
-  - python3.5
-  - intel-cl-cpu
-  except:
-  - tags
-
-Python 3.5 AMD CPU:
-  script:
-  - export PY_EXE=python3.5
-  - export PYOPENCL_TEST=amd:pu
-  - export EXTRA_INSTALL="numpy mako"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-  - ". ./build-and-test-py-project.sh"
   allow_failure: true
   tags:
-  - python3.5
-  - amd-cl-cpu
+  - python3.6
+  - intel-cl-cpu
   except:
   - tags
 
-Python 2.6 AMD CPU:
+Python 3.6 AMD CPU:
   script:
-  - export PY_EXE=python2.6
+  - export PY_EXE=python3.6
   - export PYOPENCL_TEST=amd:pu
   - export EXTRA_INSTALL="numpy mako"
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   allow_failure: true
   tags:
-  - python2.6
+  - python3.6
   - amd-cl-cpu
   except:
   - tags
@@ -95,15 +82,28 @@ Python 3.5 AMD GPU:
   except:
   - tags
 
-Python 3.6 POCL:
+Python 2.6 POCL CPU:
   script:
-  - export PY_EXE=python3.6
+  - export PY_EXE=python2.6
   - export PYOPENCL_TEST=portable
   - export EXTRA_INSTALL="numpy mako"
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
-  - python3.6
+  - python2.6
+  - amd-cl-cpu
+  except:
+  - tags
+
+Python 2.7 POCL:
+  script:
+  - export PY_EXE=python2.7
+  - export PYOPENCL_TEST=portable
+  - export EXTRA_INSTALL="numpy mako"
+  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
+  tags:
+  - python2.7
   - pocl
   except:
   - tags
@@ -122,15 +122,15 @@ Python 3.5 POCL CL 1.1:
   except:
   - tags
 
-Python 2.7 POCL:
+Python 3.6 POCL:
   script:
-  - export PY_EXE=python2.7
+  - export PY_EXE=python3.6
   - export PYOPENCL_TEST=portable
   - export EXTRA_INSTALL="numpy mako"
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
-  - python2.7
+  - python3.6
   - pocl
   except:
   - tags
-- 
GitLab