Merge branch 'reenable-intel-cl' into 'master'

Reenable Intel CI, delete AMD CPU CI

See merge request inducer/pyopencl!88

.gitlab-ci.yml

@@ -19,11 +19,11 @@
 Python 3 Intel CPU:
   script:
   - export PY_EXE=python3
+  - source /opt/enable-intel-cl.sh
   - export PYOPENCL_TEST="intel(r):pu"
   - export EXTRA_INSTALL="pybind11 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
   - intel-cl-cpu
@@ -33,23 +33,6 @@ Python 3 Intel CPU:
     reports:
       junit: test/pytest.xml
 
-Python 3 AMD CPU:
-  script:
-  - export PY_EXE=python3
-  - export PYOPENCL_TEST=amd:pu
-  - export EXTRA_INSTALL="pybind11 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
-  - amd-cl-cpu
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3 Titan X:
   script:
   - export PY_EXE=python3