jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404470 )
Change subject: Migrate most Doxygen jobs to Docker
......................................................................
Migrate most Doxygen jobs to Docker
Still on Jessie few.
Also archive /log if there are files in it.
Update:
doxygen-publish
mwext-doxygen-publish
oojs-ui-doxygen-publish
Change-Id: Ib0ccfc63109708c99cc0ac6da289c5ee73355af7
---
A dockerfiles/doxygen/.dockerignore
A dockerfiles/doxygen/.gitignore
A dockerfiles/doxygen/Dockerfile.template
A dockerfiles/doxygen/changelog
A dockerfiles/doxygen/control
A dockerfiles/doxygen/example-run.sh
A dockerfiles/doxygen/run.sh
M jjb/mediawiki-extensions.yaml
M jjb/misc.yaml
9 files changed, 90 insertions(+), 11 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dockerfiles/doxygen/.dockerignore
b/dockerfiles/doxygen/.dockerignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/doxygen/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/doxygen/.gitignore b/dockerfiles/doxygen/.gitignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/doxygen/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/doxygen/Dockerfile.template
b/dockerfiles/doxygen/Dockerfile.template
new file mode 100644
index 0000000..a7a16c1
--- /dev/null
+++ b/dockerfiles/doxygen/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM {{ "ci-jessie" | image_tag }}
+
+RUN {{ "doxygen graphviz" | apt_install }}
+
+COPY run.sh /run.sh
+
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/doxygen/changelog b/dockerfiles/doxygen/changelog
new file mode 100644
index 0000000..78c7777
--- /dev/null
+++ b/dockerfiles/doxygen/changelog
@@ -0,0 +1,5 @@
+doxygen (0.1.0) wikimedia; urgency=medium
+
+ * Initial creation. Based on Jessie.
+
+ -- Antoine Musso <has...@free.fr> Tue, 16 Jan 2018 15:53:04 +0100
diff --git a/dockerfiles/doxygen/control b/dockerfiles/doxygen/control
new file mode 100644
index 0000000..8c6d9e3
--- /dev/null
+++ b/dockerfiles/doxygen/control
@@ -0,0 +1 @@
+Depends: ci-jessie
diff --git a/dockerfiles/doxygen/example-run.sh
b/dockerfiles/doxygen/example-run.sh
new file mode 100755
index 0000000..568c0af
--- /dev/null
+++ b/dockerfiles/doxygen/example-run.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -eux -o pipefail
+
+mkdir -m 777 -p log
+mkdir -m 777 -p src
+mkdir -m 777 -p cache
+
+(cd src
+ git init
+ git fetch --quiet --depth 1
"https://gerrit.wikimedia.org/r/mediawiki/oauthclient-php";
+ git checkout FETCH_HEAD
+)
+
+echo "Cleaning generated documentation in /src/doc"
+docker run \
+ --rm --tty \
+ --volume /"$(pwd)"/src://src \
+ --entrypoint=/bin/rm \
+ docker-registry.wikimedia.org/releng/doxygen:latest \
+ -fR /src/doc
+
+docker run \
+ --rm --tty \
+ --volume /"$(pwd)"/log://var/lib/jenkins/log \
+ --volume /"$(pwd)"/cache://cache \
+ --volume /"$(pwd)"/src://src \
+ docker-registry.wikimedia.org/releng/doxygen:latest
+
+set +x
+if [ -e src/doc/html/index.html ]; then
+ echo "Doxygen documentation generated"
+else
+ echo "Doxygen documentation has NOT been generated"
+ exit 1
+fi
diff --git a/dockerfiles/doxygen/run.sh b/dockerfiles/doxygen/run.sh
new file mode 100755
index 0000000..657bc64
--- /dev/null
+++ b/dockerfiles/doxygen/run.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+umask 002
+
+set -euxo pipefail
+
+doxygen --version
+cd /src
+exec doxygen
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index eb21d51..5d33fc3 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -338,16 +338,21 @@
- job:
name: 'mwext-doxygen-publish'
- node: ci-jessie-wikimedia
- defaults: use-remote-zuul-shallow-clone
+ node: DebianJessieDocker
concurrent: false
triggers:
- zuul
builders:
- - shell: doxygen
+ - docker-log-dir
+ - docker-src-dir
+ - docker-run-with-log-cache-src:
+ image: docker-registry.wikimedia.org/releng/doxygen:0.1.0
+ logdir: '/log'
- doc-publish:
- docsrc: 'docs/php'
+ docsrc: 'src/docs/php'
docdest: '$DOC_BASENAME/$DOC_SUBPATH/php'
+ archive:
+ - archive-log-allow-empty
# Phan! (T153039)
- job:
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 1481291..eca3d22 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -4,16 +4,21 @@
# matches the Git repository name.
- job:
name: 'doxygen-publish'
- node: ci-jessie-wikimedia
- defaults: use-remote-zuul-shallow-clone
+ node: DebianJessieDocker
concurrent: false
triggers:
- zuul
builders:
- - shell: doxygen
+ - docker-log-dir
+ - docker-src-dir
+ - docker-run-with-log-cache-src:
+ image: docker-registry.wikimedia.org/releng/doxygen:0.1.0
+ logdir: '/log'
- doc-publish:
- docsrc: 'doc/html'
+ docsrc: 'src/doc/html'
docdest: '$DOC_PROJECT/$DOC_SUBPATH'
+ archive:
+ - archive-log-allow-empty
- job: &phpunit-coverage-publish
name: 'phpunit-coverage-publish'
@@ -194,16 +199,21 @@
- job:
name: 'oojs-ui-doxygen-publish'
- node: ci-jessie-wikimedia
- defaults: use-remote-zuul-shallow-clone
+ node: DebianJessieDocker
concurrent: false
triggers:
- zuul
builders:
- - shell: doxygen
+ - docker-log-dir
+ - docker-src-dir
+ - docker-run-with-log-cache-src:
+ image: docker-registry.wikimedia.org/releng/doxygen:0.1.0
+ logdir: '/log'
- doc-publish:
docsrc: 'doc/html'
docdest: 'oojs-ui/$DOC_SUBPATH/php'
+ archive:
+ - archive-log-allow-empty
- job:
name: 'oojs-ui-demos-publish'
--
To view, visit https://gerrit.wikimedia.org/r/404470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0ccfc63109708c99cc0ac6da289c5ee73355af7
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
