jenkins-bot has submitted this change and it was merged.
Change subject: Publish Android app on postmerge
......................................................................
Publish Android app on postmerge
* Add apps-android-wikipedia-publish job template trigger on postmerge.
This job just builds the app alpha and writes a JSON scrap identifying
the Git revision and time. android-builds.wmflabs.org can continue to
use a periodic file copy Cron kludge using the last successful
artifacts[0].
* Rename apps-android-wikipedia-gradlew-* to apps-android-wikipedia-*.
apps-android-wikipedia no longer supports Maven and the distinction is
unnecessary.
[0]
integration.wikimedia.org/ci/job/apps-android-wikipedia-publish/lastSuccessfulBuild/artifact/{app/build/outputs/apk/app-alpha-release.apk,meta.json}
Bug: T99115
Change-Id: Ie89f5592d9aa83d179ddc2920e49d97875538d1a
---
M jjb/mobile.yaml
M zuul/layout.yaml
2 files changed, 38 insertions(+), 10 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index e850123..95b8e92 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -7,7 +7,7 @@
- '{name}-phplint'
- job-template:
- name: 'apps-android-wikipedia-gradlew'
+ name: 'apps-android-wikipedia-test'
node: contintLabsSlave && AndroidEmulator
defaults: use-remoteonly-zuul
concurrent: true
@@ -52,9 +52,32 @@
- junit:
results: '**/test-results/**/*.xml,**/androidTest-results/**/*.xml'
+- job-template:
+ name: 'apps-android-wikipedia-publish'
+ node: contintLabsSlave && UbuntuTrusty
+ defaults: use-remoteonly-zuul
+ concurrent: true
+ triggers:
+ - zuul
+ wrappers:
+ - timeout:
+ timeout: 30
+ fail: true
+ - timestamps
+ - ansicolor
+ builders:
+ - shell: |
+ declare START_TIME="$(date +"%Y-%m-%dT%H:%M:%S.%N")"
+ ./gradlew -q clean assembleAlphaRelease
+ echo "{{\"commit_hash\": \"$GIT_COMMIT\", \"completed_on\":
\"$START_TIME\"}}" > meta.json
+ publishers:
+ - archive:
+ # Capture generated .apk and meta.json
+ artifacts: '**/build/outputs/**,meta.json'
+
# Additional lint check, not passing as of May 2015
- job-template:
- name: 'apps-android-wikipedia-gradlew-lint'
+ name: 'apps-android-wikipedia-lint'
node: contintLabsSlave && UbuntuTrusty
defaults: use-remoteonly-zuul
concurrent: true
@@ -70,8 +93,9 @@
- project:
name: 'apps-android-wikipedia'
jobs:
- - 'apps-android-wikipedia-gradlew'
- - 'apps-android-wikipedia-gradlew-lint'
+ - 'apps-android-wikipedia-test'
+ - 'apps-android-wikipedia-publish'
+ - 'apps-android-wikipedia-lint'
# Build the mighty Commons application for Android Platforms
# Yuvi rocks (bug 20281).
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 14bc16a..aa13790 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1601,14 +1601,14 @@
voting: false
# This job does more than one thing. Point to the build page and let the
user drill into details.
- - name: apps-android-wikipedia-gradlew
+ - name: ^apps-android-wikipedia-.+$
failure-pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/'
success-pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/'
# Lint not passing yet. The lintAlphaDebug will be integrated in the other
# job later on.
- - name: apps-android-wikipedia-gradlew-lint
- voting: false
+ - name: apps-android-wikipedia-lint
+ voting: false # TODO: add to gate-and-submit once voting.
failure-pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/artifact/app/build/outputs/lint-results-alphaDebug.html'
success-pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/artifact/app/build/outputs/lint-results-alphaDebug.html'
@@ -2200,12 +2200,16 @@
test:
- apps-jslint
- tox-flake8
- - apps-android-wikipedia-gradlew
- - apps-android-wikipedia-gradlew-lint
+ - apps-android-wikipedia-test
+ - apps-android-wikipedia-lint
gate-and-submit:
- apps-jslint
- tox-flake8
- - apps-android-wikipedia-gradlew
+ - apps-android-wikipedia-test
+ # TODO: uncomment once this job votes.
+ # - apps-android-wikipedia-lint
+ postmerge:
+ - apps-android-wikipedia-publish
- name: apps/ios/wikipedia
check-voter:
--
To view, visit https://gerrit.wikimedia.org/r/231624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie89f5592d9aa83d179ddc2920e49d97875538d1a
Gerrit-PatchSet: 5
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
