From 49931fda56dc6268ba3c104b64768f551cfc4636 Mon Sep 17 00:00:00 2001
From: Denys Zariaiev <denys.zariaiev@gmail.com>
Date: Tue, 29 Jan 2019 21:00:07 +0100
Subject: [PATCH] Use correct CI test image for WASM and NVPTX

---
 .travis.yml                         |  4 +---
 src/ci/docker/nvptx-cuda/Dockerfile | 18 ------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 src/ci/docker/nvptx-cuda/Dockerfile

diff --git a/.travis.yml b/.travis.yml
index a8e1bfbbfa93a..7985b6c0e191f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,7 +168,7 @@ matrix:
       if: branch = auto
     - env: IMAGE=i686-gnu-nopt
       if: branch = auto
-    - env: IMAGE=wasm32-unknown
+    - env: IMAGE=test-various
       if: branch = auto
     - env: IMAGE=x86_64-gnu
       if: branch = auto
@@ -186,8 +186,6 @@ matrix:
       if: branch = auto
     - env: IMAGE=mingw-check
       if: type = pull_request OR branch = auto
-    - env: IMAGE=nvptx-cuda
-      if: branch = auto
 
     - stage: publish toolstate
       if: branch = master AND type = push
diff --git a/src/ci/docker/nvptx-cuda/Dockerfile b/src/ci/docker/nvptx-cuda/Dockerfile
deleted file mode 100644
index c7c3ca6bc5417..0000000000000
--- a/src/ci/docker/nvptx-cuda/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends \
-    g++ make file curl ca-certificates python git \
-    cmake sudo gdb
-
-# FIXME: setup `ptx-linker` CI for automatic binary releases.
-RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-alpha.1/rust-ptx-linker.linux64.tar.gz | \
-    tar -xzvC /usr/bin
-
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
-
-ENV TARGETS=nvptx64-nvidia-cuda
-
-ENV SCRIPT python2.7 /checkout/x.py test --target $TARGETS \
-    src/test/run-make