diff --git a/ci/Dockerfile b/ci/Dockerfile deleted file mode 100644 index ae6caba..0000000 --- a/ci/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM fedora:27 - -RUN dnf install -y \ - ansible \ - openssh-clients \ - python2-netaddr - -# XXX These UID/GIDs must match the Jenkins UID/GID on the agent -RUN groupadd -g 992 jenkins -RUN useradd -u 995 -g jenkins -c Jenkins -d /var/lib/jenkins -m jenkins - -RUN install -m 700 -o jenkins -g jenkins -d /var/lib/jenkins/.ssh -COPY known_hosts /var/lib/jenkins/.ssh/ -RUN chown jenkins:jenkins /var/lib/jenkins/.ssh/known_hosts diff --git a/ci/dch-gw.jenkinsfile b/ci/dch-gw.jenkinsfile index ee4df48..77e464c 100644 --- a/ci/dch-gw.jenkinsfile +++ b/ci/dch-gw.jenkinsfile @@ -2,9 +2,7 @@ pipeline { agent { - dockerfile { - dir 'ci' - } + label 'ansible' } triggers { diff --git a/ci/known_hosts b/ci/known_hosts deleted file mode 100644 index 20b3037..0000000 --- a/ci/known_hosts +++ /dev/null @@ -1,3 +0,0 @@ -172.31.0.1 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQJj11B1OqSfx/OHkJ5rzwk6ENLjMgfaVfkYC6xc7Ly -dc0.pyrocufflink.blue ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILnQc6ySo4twuKSx3JRQng4LufIC9beOWe7MvyfzVdNH -dc1.pyrocufflink.blue ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMS87Xa5C3AS7Pum2GwT9DnZFP34gaRE59w0G2oa8+EO diff --git a/ci/samba-dc.jenkinsfile b/ci/samba-dc.jenkinsfile index a3f4e63..1889fb7 100644 --- a/ci/samba-dc.jenkinsfile +++ b/ci/samba-dc.jenkinsfile @@ -2,9 +2,7 @@ pipeline { agent { - dockerfile { - dir 'ci' - } + label 'ansible' } triggers {