[MediaWiki-commits] [Gerrit] integration/config[master]: Add experimental "composer-package-php70-docker" job

2017-10-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381378 )

Change subject: Add experimental "composer-package-php70-docker" job
..


Add experimental "composer-package-php70-docker" job

Change-Id: I3cc35d39b39a7b6e9a38455b9264bb0d2b243ee2
---
A dockerfiles/composer-package/Dockerfile
A dockerfiles/composer-package/example-run.sh
A dockerfiles/composer-package/run.sh
M jjb/php.yaml
M zuul/layout.yaml
5 files changed, 53 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/dockerfiles/composer-package/Dockerfile 
b/dockerfiles/composer-package/Dockerfile
new file mode 100644
index 000..2f1edf1
--- /dev/null
+++ b/dockerfiles/composer-package/Dockerfile
@@ -0,0 +1,11 @@
+FROM wmfreleng/composer:latest as composer
+
+FROM wmfreleng/php-mediawiki:latest
+
+USER root
+
+COPY --from=composer /srv/composer /srv/composer
+
+USER nobody
+COPY run.sh /run.sh
+ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-package/example-run.sh 
b/dockerfiles/composer-package/example-run.sh
new file mode 100644
index 000..80fd8a1
--- /dev/null
+++ b/dockerfiles/composer-package/example-run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+install --mode 777 --directory log
+docker run \
+--rm --tty \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=utfnormal \
+--env ZUUL_COMMIT=668604441afd899efb073ce4c6b5545341ef6582 \
+--env ZUUL_REF=refs/changes/57/375857/1 \
+--volume /$(pwd)/log://var/lib/jenkins/log \
+ wmfreleng/composer-package:latest
diff --git a/dockerfiles/composer-package/run.sh 
b/dockerfiles/composer-package/run.sh
new file mode 100644
index 000..581f4c3
--- /dev/null
+++ b/dockerfiles/composer-package/run.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+cd /src
+
+git init
+git fetch --quiet --depth 1 "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
+git checkout FETCH_HEAD
+git submodule --quiet update --init --recursive
+
+/srv/composer/vendor/bin/composer --ansi validate
+/srv/composer/vendor/bin/composer install --no-progress
+/srv/composer/vendor/bin/composer test
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 7fefde1..666467d 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -127,6 +127,23 @@
 publishers:
  - castor-save
 
+- job:
+name: 'composer-package-php70-docker'
+node: DebianJessieDocker
+concurrent: true
+properties:
+ - build-discarder:
+ days-to-keep: 15
+triggers:
+ - zuul
+builders:
+ - docker-zuul-env
+ - docker-log-dir
+ - docker-cache-dir
+ - docker-run-with-log-and-workspace-cache:
+image: 'wmfreleng/composer-package:v2017.10.02.18.02'
+logdir: '/log'
+
 # Couple jobs with a {name} prefix
 - job-template:
 !!merge : *job_composer-phpflavor-image
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7c35aa9..3b5445b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1196,7 +1196,7 @@
   - composer-package-hhvm-jessie
   - composer-package-php55-jessie
 experimental:
-  - composer-package-php70-jessie
+  - composer-package-php70-docker
 
   - name: npm
 test:
@@ -6347,7 +6347,7 @@
   - composer-package-hhvm-jessie
   - composer-package-php55-jessie
 experimental:
-  - composer-package-php70-jessie
+  - composer-package-php70-docker
 
   - name: mediawiki/services/mathoid
 template:

-- 
To view, visit https://gerrit.wikimedia.org/r/381378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3cc35d39b39a7b6e9a38455b9264bb0d2b243ee2
Gerrit-PatchSet: 7
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Add experimental "composer-package-php70-docker" job

2017-09-28 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381378 )

Change subject: Add experimental "composer-package-php70-docker" job
..

Add experimental "composer-package-php70-docker" job

Change-Id: I3cc35d39b39a7b6e9a38455b9264bb0d2b243ee2
---
A dockerfiles/composer-package-php70/Dockerfile
A dockerfiles/composer-package-php70/example-run.sh
A dockerfiles/composer-package-php70/run.sh
M jjb/php.yaml
M zuul/layout.yaml
5 files changed, 52 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/78/381378/1

diff --git a/dockerfiles/composer-package-php70/Dockerfile 
b/dockerfiles/composer-package-php70/Dockerfile
new file mode 100644
index 000..dee5077
--- /dev/null
+++ b/dockerfiles/composer-package-php70/Dockerfile
@@ -0,0 +1,11 @@
+FROM wmfreleng/composer:latest as composer
+
+FROM wmfreleng/php70-mediawiki:latest
+
+USER root
+
+COPY --from=composer /srv/composer /srv/composer
+
+USER nobody
+COPY run.sh /run.sh
+ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-package-php70/example-run.sh 
b/dockerfiles/composer-package-php70/example-run.sh
new file mode 100644
index 000..d6f6f97
--- /dev/null
+++ b/dockerfiles/composer-package-php70/example-run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+install --mode 777 --directory log
+docker run \
+--rm --tty \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=utfnormal \
+--env ZUUL_COMMIT=668604441afd899efb073ce4c6b5545341ef6582 \
+--env ZUUL_REF=refs/changes/57/375857/1 \
+--volume /$(pwd)/log://var/lib/jenkins/log \
+ wmfreleng/composer-package-php70:latest
diff --git a/dockerfiles/composer-package-php70/run.sh 
b/dockerfiles/composer-package-php70/run.sh
new file mode 100644
index 000..a0adfbe
--- /dev/null
+++ b/dockerfiles/composer-package-php70/run.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+cd /src
+
+git init
+git fetch --quiet --depth 1 "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
+git checkout FETCH_HEAD
+git submodule --quiet update --init --recursive
+
+/srv/composer/vendor/bin/composer install --no-progress
+/srv/composer/vendor/bin/composer test
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 7fefde1..436ef1d 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -127,6 +127,23 @@
 publishers:
  - castor-save
 
+- job:
+name: 'composer-package-php70-docker'
+node: DebianJessieDocker
+concurrent: true
+properties:
+ - build-discarder:
+ days-to-keep: 15
+triggers:
+ - zuul
+builders:
+ - docker-zuul-env
+ - docker-log-dir
+ - docker-cache-dir
+ - docker-run-with-log-and-workspace-cache:
+image: 'wmfreleng/composer-package-php70:v2017.09.29.XX.XX'
+logdir: '/log'
+
 # Couple jobs with a {name} prefix
 - job-template:
 !!merge : *job_composer-phpflavor-image
@@ -140,8 +157,6 @@
 name: 'composer-flavored-on-nodepool'
 phpflavor:
 - php55:
-image: jessie
-- php70:
 image: jessie
 - hhvm:
 image: jessie
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3baeca4..89bed08 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1201,7 +1201,7 @@
   - composer-package-hhvm-jessie
   - composer-package-php55-jessie
 experimental:
-  - composer-package-php70-jessie
+  - composer-package-php70-docker
 
   - name: npm
 test:
@@ -6336,7 +6336,7 @@
   - composer-package-hhvm-jessie
   - composer-package-php55-jessie
 experimental:
-  - composer-package-php70-jessie
+  - composer-package-php70-docker
 
   - name: mediawiki/services/mathoid
 template:

-- 
To view, visit https://gerrit.wikimedia.org/r/381378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cc35d39b39a7b6e9a38455b9264bb0d2b243ee2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits