jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399793 )
Change subject: Convert tox docker images to docker-pkg
......................................................................
Convert tox docker images to docker-pkg
Add .dockerignore files for example-run.sh
Also add libssl-dev to cergen.
Update jobs:
cergen-tox-docker
conftool-tox-docker
eventlogging-tox-docker
labs-striker-tox-docker
labs-tools-heritage-tox-docker
pywikibot-CommonsDelinker-tox-docker
pywikibot-core-tox-doc-docker
pywikibot-core-tox-docker
pywikibot-core-tox-nose34-docker
pywikibot-core-tox-nose-docker
pywikibot-FLOSSbot-tox-docker
pywikibot-wikibase-tox-docker
pywikibot-xqbot-tox-docker
search-mjolnir-tox-docker
Bug: T177276
Change-Id: I4a2eba2435b53e4aec00a5203b76860cf21a477c
---
A dockerfiles/tox-cergen/.dockerignore
D dockerfiles/tox-cergen/Dockerfile
A dockerfiles/tox-cergen/Dockerfile.template
A dockerfiles/tox-cergen/changelog
A dockerfiles/tox-cergen/control
M dockerfiles/tox-cergen/example-run.sh
A dockerfiles/tox-conftool/.dockerignore
D dockerfiles/tox-conftool/Dockerfile
A dockerfiles/tox-conftool/Dockerfile.template
A dockerfiles/tox-conftool/changelog
A dockerfiles/tox-conftool/control
M dockerfiles/tox-conftool/example-run.sh
A dockerfiles/tox-eventlogging/.dockerignore
D dockerfiles/tox-eventlogging/Dockerfile
A dockerfiles/tox-eventlogging/Dockerfile.template
A dockerfiles/tox-eventlogging/changelog
A dockerfiles/tox-eventlogging/control
M dockerfiles/tox-eventlogging/example-run.sh
A dockerfiles/tox-labs-striker/.dockerignore
D dockerfiles/tox-labs-striker/Dockerfile
A dockerfiles/tox-labs-striker/Dockerfile.template
A dockerfiles/tox-labs-striker/changelog
A dockerfiles/tox-labs-striker/control
M dockerfiles/tox-labs-striker/example-run.sh
M dockerfiles/tox-pyspark/.dockerignore
R dockerfiles/tox-pyspark/Dockerfile.template
A dockerfiles/tox-pyspark/changelog
A dockerfiles/tox-pyspark/control
M dockerfiles/tox-pyspark/example-run.sh
A dockerfiles/tox-pywikibot/.dockerignore
R dockerfiles/tox-pywikibot/Dockerfile.template
A dockerfiles/tox-pywikibot/changelog
A dockerfiles/tox-pywikibot/control
M dockerfiles/tox-pywikibot/example-run.sh
M jjb/labs.yaml
M jjb/misc.yaml
M jjb/operations-misc.yaml
M jjb/pywikibot.yaml
M jjb/search.yaml
39 files changed, 96 insertions(+), 70 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dockerfiles/tox-cergen/.dockerignore
b/dockerfiles/tox-cergen/.dockerignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/tox-cergen/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/tox-cergen/Dockerfile
b/dockerfiles/tox-cergen/Dockerfile
deleted file mode 100644
index 131eb7a..0000000
--- a/dockerfiles/tox-cergen/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM wmfreleng/tox
-
-USER root
-RUN apt-get update && \
- apt-get install --yes \
- openjdk-8-jre-headless && \
- rm -rf /var/lib/apt/lists/*
-
-USER nobody
diff --git a/dockerfiles/tox-cergen/Dockerfile.template
b/dockerfiles/tox-cergen/Dockerfile.template
new file mode 100644
index 0000000..8020afb
--- /dev/null
+++ b/dockerfiles/tox-cergen/Dockerfile.template
@@ -0,0 +1,6 @@
+FROM {{ "tox" | image_tag }}
+
+USER root
+RUN {{ "openjdk-8-jre-headless libssl-dev" | apt_install }}
+
+USER nobody
diff --git a/dockerfiles/tox-cergen/changelog b/dockerfiles/tox-cergen/changelog
new file mode 100644
index 0000000..39ee138
--- /dev/null
+++ b/dockerfiles/tox-cergen/changelog
@@ -0,0 +1,5 @@
+tox-cergen (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Antoine Musso <[email protected]> Fri, 22 Dec 2017 11:28:10 +0100
diff --git a/dockerfiles/tox-cergen/control b/dockerfiles/tox-cergen/control
new file mode 100644
index 0000000..e117f70
--- /dev/null
+++ b/dockerfiles/tox-cergen/control
@@ -0,0 +1 @@
+Depends: tox
diff --git a/dockerfiles/tox-cergen/example-run.sh
b/dockerfiles/tox-cergen/example-run.sh
index 5a32dc9..8432c81 100644
--- a/dockerfiles/tox-cergen/example-run.sh
+++ b/dockerfiles/tox-cergen/example-run.sh
@@ -11,4 +11,4 @@
--env ZUUL_REF=master \
--volume /"$(pwd)"/log://log \
--volume /"$(pwd)"/cache://cache \
- wmfreleng/tox-cergen:latest
+ docker-registry.wikimedia.org/releng/tox-cergen:latest
diff --git a/dockerfiles/tox-conftool/.dockerignore
b/dockerfiles/tox-conftool/.dockerignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/tox-conftool/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/tox-conftool/Dockerfile
b/dockerfiles/tox-conftool/Dockerfile
deleted file mode 100644
index dd81a78..0000000
--- a/dockerfiles/tox-conftool/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM wmfreleng/tox
-
-USER root
-RUN apt-get update && \
- apt-get install --yes \
- python-etcd \
- python-conftool \
- etcd \
- python-etcd \
- python-conftool \
- && \
- apt-get clean && rm -rf /var/lib/apt/lists/*
-
-USER nobody
diff --git a/dockerfiles/tox-conftool/Dockerfile.template
b/dockerfiles/tox-conftool/Dockerfile.template
new file mode 100644
index 0000000..3ad2e3c
--- /dev/null
+++ b/dockerfiles/tox-conftool/Dockerfile.template
@@ -0,0 +1,6 @@
+FROM {{ "tox" | image_tag }}
+
+USER root
+RUN {{ "python-etcd python-conftool etcd python-etcd python-conftool" |
apt_install }}
+
+USER nobody
diff --git a/dockerfiles/tox-conftool/changelog
b/dockerfiles/tox-conftool/changelog
new file mode 100644
index 0000000..1841180
--- /dev/null
+++ b/dockerfiles/tox-conftool/changelog
@@ -0,0 +1,5 @@
+tox-conftool (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Antoine Musso <[email protected]> Fri, 22 Dec 2017 11:28:10 +0100
diff --git a/dockerfiles/tox-conftool/control b/dockerfiles/tox-conftool/control
new file mode 100644
index 0000000..e117f70
--- /dev/null
+++ b/dockerfiles/tox-conftool/control
@@ -0,0 +1 @@
+Depends: tox
diff --git a/dockerfiles/tox-conftool/example-run.sh
b/dockerfiles/tox-conftool/example-run.sh
index c794da6..43d8e9c 100644
--- a/dockerfiles/tox-conftool/example-run.sh
+++ b/dockerfiles/tox-conftool/example-run.sh
@@ -11,4 +11,4 @@
--env ZUUL_REF=master \
--volume /"$(pwd)"/log://log \
--volume /"$(pwd)"/cache://cache \
- wmfreleng/tox-conftool:latest
+ docker-registry.wikimedia.org/releng/tox-conftool:latest
diff --git a/dockerfiles/tox-eventlogging/.dockerignore
b/dockerfiles/tox-eventlogging/.dockerignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/tox-eventlogging/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/tox-eventlogging/Dockerfile
b/dockerfiles/tox-eventlogging/Dockerfile
deleted file mode 100644
index aee65a5..0000000
--- a/dockerfiles/tox-eventlogging/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM wmfreleng/tox
-
-USER root
-RUN apt-get update && \
- apt-get install --yes \
- librdkafka-dev \
- && \
- rm -rf /var/lib/apt/lists/*
-
-USER nobody
diff --git a/dockerfiles/tox-eventlogging/Dockerfile.template
b/dockerfiles/tox-eventlogging/Dockerfile.template
new file mode 100644
index 0000000..69c0b59
--- /dev/null
+++ b/dockerfiles/tox-eventlogging/Dockerfile.template
@@ -0,0 +1,6 @@
+FROM {{ "tox" | image_tag }}
+
+USER root
+RUN {{ "librdkafka-dev" | apt_install }}
+
+USER nobody
diff --git a/dockerfiles/tox-eventlogging/changelog
b/dockerfiles/tox-eventlogging/changelog
new file mode 100644
index 0000000..f66593e
--- /dev/null
+++ b/dockerfiles/tox-eventlogging/changelog
@@ -0,0 +1,5 @@
+tox-eventlogging (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Antoine Musso <[email protected]> Fri, 22 Dec 2017 11:28:10 +0100
diff --git a/dockerfiles/tox-eventlogging/control
b/dockerfiles/tox-eventlogging/control
new file mode 100644
index 0000000..e117f70
--- /dev/null
+++ b/dockerfiles/tox-eventlogging/control
@@ -0,0 +1 @@
+Depends: tox
diff --git a/dockerfiles/tox-eventlogging/example-run.sh
b/dockerfiles/tox-eventlogging/example-run.sh
index 3eadf2b..4a0e68e 100644
--- a/dockerfiles/tox-eventlogging/example-run.sh
+++ b/dockerfiles/tox-eventlogging/example-run.sh
@@ -11,4 +11,4 @@
--env ZUUL_REF=master \
--volume /"$(pwd)"/log://log \
--volume /"$(pwd)"/cache://cache \
- wmfreleng/tox-eventlogging:latest
+ docker-registry.wikimedia.org/releng/tox-eventlogging:latest
diff --git a/dockerfiles/tox-labs-striker/.dockerignore
b/dockerfiles/tox-labs-striker/.dockerignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/tox-labs-striker/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/tox-labs-striker/Dockerfile
b/dockerfiles/tox-labs-striker/Dockerfile
deleted file mode 100644
index 9f0bfb4..0000000
--- a/dockerfiles/tox-labs-striker/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM wmfreleng/tox
-
-USER root
-RUN apt-get update && \
- apt-get install --yes \
- libldap2-dev \
- libsasl2-dev \
- && \
- rm -rf /var/lib/apt/lists/*
-
-USER nobody
diff --git a/dockerfiles/tox-labs-striker/Dockerfile.template
b/dockerfiles/tox-labs-striker/Dockerfile.template
new file mode 100644
index 0000000..8489b5f
--- /dev/null
+++ b/dockerfiles/tox-labs-striker/Dockerfile.template
@@ -0,0 +1,6 @@
+FROM {{ "tox" | image_tag }}
+
+USER root
+RUN {{ "libldap2-dev libsasl2-dev" | apt_install }}
+
+USER nobody
diff --git a/dockerfiles/tox-labs-striker/changelog
b/dockerfiles/tox-labs-striker/changelog
new file mode 100644
index 0000000..f4b9230
--- /dev/null
+++ b/dockerfiles/tox-labs-striker/changelog
@@ -0,0 +1,5 @@
+tox-labs-striker (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Antoine Musso <[email protected]> Fri, 22 Dec 2017 11:28:10 +0100
diff --git a/dockerfiles/tox-labs-striker/control
b/dockerfiles/tox-labs-striker/control
new file mode 100644
index 0000000..e117f70
--- /dev/null
+++ b/dockerfiles/tox-labs-striker/control
@@ -0,0 +1 @@
+Depends: tox
diff --git a/dockerfiles/tox-labs-striker/example-run.sh
b/dockerfiles/tox-labs-striker/example-run.sh
index beb125c..89a7762 100644
--- a/dockerfiles/tox-labs-striker/example-run.sh
+++ b/dockerfiles/tox-labs-striker/example-run.sh
@@ -11,4 +11,4 @@
--env ZUUL_REF=master \
--volume /"$(pwd)"/log://log \
--volume /"$(pwd)"/cache://cache \
- wmfreleng/tox-labs-striker:latest
+ docker-registry.wikimedia.org/releng/tox-labs-striker:latest
diff --git a/dockerfiles/tox-pyspark/.dockerignore
b/dockerfiles/tox-pyspark/.dockerignore
index 06cf653..139ce78 100644
--- a/dockerfiles/tox-pyspark/.dockerignore
+++ b/dockerfiles/tox-pyspark/.dockerignore
@@ -1 +1,3 @@
-cache
+/cache
+/log
+/src
diff --git a/dockerfiles/tox-pyspark/Dockerfile
b/dockerfiles/tox-pyspark/Dockerfile.template
similarity index 76%
rename from dockerfiles/tox-pyspark/Dockerfile
rename to dockerfiles/tox-pyspark/Dockerfile.template
index 50e8228..2f31c4d 100644
--- a/dockerfiles/tox-pyspark/Dockerfile
+++ b/dockerfiles/tox-pyspark/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/tox:latest
+FROM {{ "tox" | image_tag }}
USER root
@@ -7,14 +7,7 @@
# liblapack3 and libgomp1 are specifically needed for search/MjoLniR which
# runs numerical algorithms
-RUN apt-get update && \
- apt-get install --yes \
- openjdk-7-jre-headless \
- liblapack3 \
- libgomp1 \
- wget \
- && \
- rm -rf /var/lib/apt/lists/* && \
+RUN {{ "openjdk-7-jre-headless liblapack3 libgomp1 wget" | apt_install }} && \
cd /tmp && \
wget
http://archive.apache.org/dist/spark/spark-2.1.2/spark-2.1.2-bin-hadoop2.6.tgz
&& \
gpg --import /tmp/KEYS && \
diff --git a/dockerfiles/tox-pyspark/changelog
b/dockerfiles/tox-pyspark/changelog
new file mode 100644
index 0000000..0eae7a8
--- /dev/null
+++ b/dockerfiles/tox-pyspark/changelog
@@ -0,0 +1,5 @@
+tox-pyspark (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Antoine Musso <[email protected]> Fri, 22 Dec 2017 11:28:10 +0100
diff --git a/dockerfiles/tox-pyspark/control b/dockerfiles/tox-pyspark/control
new file mode 100644
index 0000000..e117f70
--- /dev/null
+++ b/dockerfiles/tox-pyspark/control
@@ -0,0 +1 @@
+Depends: tox
diff --git a/dockerfiles/tox-pyspark/example-run.sh
b/dockerfiles/tox-pyspark/example-run.sh
index 921de4b..038d503 100644
--- a/dockerfiles/tox-pyspark/example-run.sh
+++ b/dockerfiles/tox-pyspark/example-run.sh
@@ -11,4 +11,4 @@
--env ZUUL_REF=master \
--volume /"$(pwd)"/log://log \
--volume /"$(pwd)"/cache://cache \
- wmfreleng/tox-pyspark:latest
+ docker-registry.wikimedia.org/releng/tox-pyspark:latest
diff --git a/dockerfiles/tox-pywikibot/.dockerignore
b/dockerfiles/tox-pywikibot/.dockerignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/tox-pywikibot/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/tox-pywikibot/Dockerfile
b/dockerfiles/tox-pywikibot/Dockerfile.template
similarity index 89%
rename from dockerfiles/tox-pywikibot/Dockerfile
rename to dockerfiles/tox-pywikibot/Dockerfile.template
index 828f732..4dd38de 100644
--- a/dockerfiles/tox-pywikibot/Dockerfile
+++ b/dockerfiles/tox-pywikibot/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/tox
+FROM {{ "tox" | image_tag }}
USER root
# pywikibot requires a valid $HOME to write user-config.py to
diff --git a/dockerfiles/tox-pywikibot/changelog
b/dockerfiles/tox-pywikibot/changelog
new file mode 100644
index 0000000..4db8e1e
--- /dev/null
+++ b/dockerfiles/tox-pywikibot/changelog
@@ -0,0 +1,5 @@
+tox-pywikibot (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Antoine Musso <[email protected]> Fri, 22 Dec 2017 11:28:10 +0100
diff --git a/dockerfiles/tox-pywikibot/control
b/dockerfiles/tox-pywikibot/control
new file mode 100644
index 0000000..e117f70
--- /dev/null
+++ b/dockerfiles/tox-pywikibot/control
@@ -0,0 +1 @@
+Depends: tox
diff --git a/dockerfiles/tox-pywikibot/example-run.sh
b/dockerfiles/tox-pywikibot/example-run.sh
index a9281f7..4737e67 100644
--- a/dockerfiles/tox-pywikibot/example-run.sh
+++ b/dockerfiles/tox-pywikibot/example-run.sh
@@ -11,4 +11,4 @@
--env ZUUL_REF=master \
--volume /"$(pwd)"/log://log \
--volume /"$(pwd)"/cache://cache \
- wmfreleng/tox-pywikibot:latest -e nose34
+ docker-registry.wikimedia.org/releng/tox-pywikibot:latest -e nose34
diff --git a/jjb/labs.yaml b/jjb/labs.yaml
index 9b224e4..a787cee 100644
--- a/jjb/labs.yaml
+++ b/jjb/labs.yaml
@@ -4,13 +4,13 @@
name: 'labs-tools-heritage'
jobs:
- '{name}-tox-docker':
- docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-pywikibot:0.1.0
- project:
name: 'labs-striker'
jobs:
- '{name}-tox-docker':
- docker_image_var: wmfreleng/tox-labs-striker:v2017.11.21.19.24
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-labs-striker:0.1.0
- project:
# labs-tools-Zppixbot
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 8861c3c..f83ccfa 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -106,7 +106,7 @@
name: eventlogging
jobs:
- '{name}-tox-docker':
- docker_image_var: wmfreleng/tox-eventlogging:v2017.11.21.22.00
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-eventlogging:0.1.0
- project:
name: mapdata
diff --git a/jjb/operations-misc.yaml b/jjb/operations-misc.yaml
index d69d2ad..8bd0fb6 100644
--- a/jjb/operations-misc.yaml
+++ b/jjb/operations-misc.yaml
@@ -2,13 +2,13 @@
name: cergen
jobs:
- '{name}-tox-docker':
- docker_image_var: wmfreleng/tox-cergen:v2017.11.21.16.52
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-cergen:0.1.0
- project:
name: conftool
jobs:
- '{name}-tox-docker':
- docker_image_var: wmfreleng/tox-conftool:v2017.11.24.09.12
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-conftool:0.1.0
- job-template:
name: 'operations-dns-lint'
diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index 9aa99c5..554fa2f 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -2,13 +2,13 @@
name: pywikibot-core
jobs:
- '{name}-tox-docker':
- docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-pywikibot:0.1.0
build_timeout: 4 # minutes
- '{name}-tox-publish':
docsrc: 'docs/_build/html'
docdest: 'pywikibot'
- '{name}-tox-{toxenv}-docker':
- docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-pywikibot:0.1.0
toxenv:
- doc:
build_timeout: 10 # minutes
@@ -18,7 +18,7 @@
name: pywikibot-tox
jobs:
- '{name}-tox-docker':
- docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-pywikibot:0.1.0
# Begin of pywikibot bots
- project:
diff --git a/jjb/search.yaml b/jjb/search.yaml
index 7de8989..7b75f50 100644
--- a/jjb/search.yaml
+++ b/jjb/search.yaml
@@ -20,7 +20,7 @@
name: search-mjolnir
jobs:
- '{name}-tox-docker':
- docker_image_var: wmfreleng/tox-pyspark:v2017.11.10.21.37
+ docker_image_var:
docker-registry.wikimedia.org/releng/tox-pyspark:0.1.0
build_timeout: 6 # minutes
# Sadly this does not test the python code with the jvm code, instead
# using the last release of the jvm code, But it's a good start.
--
To view, visit https://gerrit.wikimedia.org/r/399793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a2eba2435b53e4aec00a5203b76860cf21a477c
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
