Remove obsolete slave definition
Just rely on slave-debian which has been consolidated
and used for months right now.
Change-Id: I7f90bd68f91377d587b37c1e3bfed5d16bc84bba
diff --git a/jenkins-docker/slave/Dockerfile b/jenkins-docker/slave/Dockerfile
deleted file mode 100644
index 9147a0a..0000000
--- a/jenkins-docker/slave/Dockerfile
+++ /dev/null
@@ -1,81 +0,0 @@
-FROM ubuntu:15.04
-
-USER root
-
-RUN echo "deb http://al.archive.ubuntu.com/ubuntu/ vivid universe" >> /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y default-jdk openjdk-7-jdk openjdk-8-jdk && \
- update-java-alternatives -v -s java-1.8.0-openjdk-amd64
-COPY set-java.sh /usr/bin/
-
-RUN apt-get update && apt-get install -y \
- maven \
- openssh-server \
- curl \
- git-core \
- xvfb \
- python-dev \
- python-pip \
- python-yaml \
- python-jenkins \
- ant \
- autoconf \
- automake \
- xsltproc \
- zip \
- && rm -rf /var/lib/apt/lists/*
-
-RUN useradd jenkins -d /home/jenkins -m -s /bin/bash
-RUN mkdir /home/jenkins/.ssh
-RUN chown -R jenkins:jenkins /home/jenkins/.ssh
-RUN chmod -R 700 /home/jenkins/.ssh
-
-COPY id_rsa.pub /home/jenkins/.ssh/authorized_keys
-RUN chown jenkins:jenkins /home/jenkins/.ssh/authorized_keys
-
-COPY gitconfig $JENKINS_REF/.gitconfig
-
-RUN mkdir /var/run/sshd
-RUN echo 'root:screencast' | chpasswd
-RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-
-# SSH login fix. Otherwise user is kicked off after login
-RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
-
-ENV NOTVISIBLE "in users profile"
-RUN echo "export VISIBLE=now" >> /etc/profile
-
-# Node JS for PolyGerrit build
-
-RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
-RUN sh -c 'echo "deb http://deb.nodesource.com/node_6.x trusty main" >> /etc/apt/sources.list.d/nodesource.list'
-RUN sh -c 'echo "deb-src http://deb.nodesource.com/node_6.x trusty main" >> /etc/apt/sources.list.d/nodesource.list'
-RUN apt-get update
-RUN apt-get install -y apt-utils
-RUN apt-get install -y nodejs
-
-# PolyGerrit tests
-
-RUN npm install -g web-component-tester eslint eslint-config-google eslint-plugin-html polylint polymer-cli typescript fried-twinkie
-RUN curl -sL https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-RUN sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-RUN apt-get update && apt-get install -y google-chrome-stable
-
-COPY wct.conf.json /home/jenkins/
-RUN chown jenkins:jenkins /home/jenkins/wct.conf.json
-
-RUN apt-get install -y unzip wget
-RUN mkdir /tmp/chromedriver/
-ADD http://chromedriver.storage.googleapis.com/LATEST_RELEASE /tmp/chromedriver/LATEST_RELEASE
-RUN wget -O /tmp/chromedriver/chromedriver.zip 'http://chromedriver.storage.googleapis.com/'$(cat /tmp/chromedriver/LATEST_RELEASE)'/chromedriver_linux64.zip'
-RUN unzip /tmp/chromedriver/chromedriver.zip chromedriver -d /usr/local/bin/
-RUN chmod a+x /usr/local/bin/chromedriver
-
-# Allow Android SDK tools to run on a 64-bit system, see
-# http://stackoverflow.com/a/23201209/1127485
-RUN apt-get install -y lib32stdc++6 lib32z1
-
-RUN /etc/init.d/ssh start
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-e", "-D"]
diff --git a/jenkins-docker/slave/Makefile b/jenkins-docker/slave/Makefile
deleted file mode 100644
index 5310928..0000000
--- a/jenkins-docker/slave/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-NO_CACHE=false
-IMAGE=gerritforge/gerrit-ci-slave
-
-build: id_rsa.pub
- docker build --no-cache=$(NO_CACHE) -t ${IMAGE} .
-
-id_rsa.pub: ../master/id_rsa.pub
- cp $? $@
-
-publish:
- docker push ${IMAGE}
-
-clean:
- docker rmi -f ${IMAGE}
- -rm -f id_rsa*
-
-.PHONY: clean id_rsa.pub publish
-
diff --git a/jenkins-docker/slave/gitconfig b/jenkins-docker/slave/gitconfig
deleted file mode 100644
index 3995d4a..0000000
--- a/jenkins-docker/slave/gitconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
- name = Jenkins
- email = jenkins@localhost
diff --git a/jenkins-docker/slave/set-java.sh b/jenkins-docker/slave/set-java.sh
deleted file mode 100755
index 4203060..0000000
--- a/jenkins-docker/slave/set-java.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ "$1" == "" ]
-then
- echo "Set current Java version level"
- echo ""
- echo "Use: $0 <7|8>"
- exit 1
-fi
-
-export JAVA_HOME=/usr/lib/jvm/java-$1-openjdk-amd64
-export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
-
-echo "Java set to: $(which java)"
-
diff --git a/jenkins-docker/slave/wct.conf.json b/jenkins-docker/slave/wct.conf.json
deleted file mode 100644
index 4158c03..0000000
--- a/jenkins-docker/slave/wct.conf.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "verbose": true,
- "plugins": {
- "local": {
- "browsers": ["chrome"]
- }
- }
-}
