HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D687

Post-commit cleanup of D670
ClosedAll Users
Actions

Authored by • jasongilanfarr on Apr 7 2017, 10:33 PM.

Details

Reviewers
aquamatthias
jdef
timcharper
jenkins
meichstedt
jeschkies
Commits
rMARATHON41f459bab015: Post-commit cleanup of D670
JIRA Issues
JIRA MARATHON-7059 Jenkins <-> Phabricator Integration
Summary
  • Resolves the chicken and the egg.
Test Plan
  • Can't really do it until D670

Diff Detail

Repository
rMARATHON marathon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
• jasongilanfarr updated this revision to Diff 2600.Apr 7 2017, 10:39 PM
  • Missed one comment line
timcharper accepted this revision.Apr 7 2017, 10:39 PM
This revision is now accepted and ready to land.Apr 7 2017, 10:39 PM
• jasongilanfarr added 1 JIRA issue(s): MARATHON-7059.Apr 7 2017, 11:59 PM
jdef accepted this revision.Apr 8 2017, 12:06 AM
This revision now requires changes to proceed.Apr 10 2017, 8:54 PM
• jasongilanfarr updated this revision to Diff 2622.Apr 10 2017, 10:19 PM
  • Post a comment if accept/reject fail
This revision now requires changes to proceed.Apr 10 2017, 10:59 PM
• jasongilanfarr updated this revision to Diff 2624.Apr 11 2017, 1:00 AM
  • Try better defaults for BuildInfo.version
• jasongilanfarr updated this revision to Diff 2625.Apr 11 2017, 3:17 AM
  • Post a comment if accept/reject fail
  • Try better defaults for BuildInfo.version
This revision is now accepted and ready to land.Apr 11 2017, 4:11 AM
Closed by commit rMARATHON41f459bab015: Post-commit cleanup of D670 (authored by • jasongilanfarr). · Explain WhyApr 11 2017, 6:03 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2626

View Options

Jenkinsfile.phab.groovy

11#!/usr/bin/env groovy
22
3/* BEGIN: Block of stuff that we can't have in the library for this job until the patch itself lands - chicken and egg: all in marathon.groovy */
4
5def setBuildInfo(displayName, description) {
6 currentBuild.displayName = displayName
7 currentBuild.description = description
8 return this
9}
10
11def install_dependencies() {
12 sh "chmod 0600 ~/.arcrc"
13 // JQ is broken in the image
14 sh "curl -L https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 > /tmp/jq && sudo mv /tmp/jq /usr/bin/jq && sudo chmod +x /usr/bin/jq"
15 // install ammonite (scala shell)
16 sh """mkdir -p ~/.ammonite && curl -L -o ~/.ammonite/predef.sc https://git.io/v6r5y && mkdir -p ~/.ammonite && curl -L -o ~/.ammonite/predef.sc https://git.io/v6r5y"""
17 sh """sudo curl -L -o /usr/local/bin/amm https://github.com/lihaoyi/Ammonite/releases/download/0.8.2/2.12-0.8.2 && sudo chmod +x /usr/local/bin/amm"""
18 return this
19}
20
21def checkout_marathon_master() {
22 git changelog: false, credentialsId: '4ff09dce-407b-41d3-847a-9e6609dd91b8', poll: false, url: 'git@github.com:mesosphere/marathon.git'
23 sh "sudo git clean -fdx"
24 return this
25}
26
27def ignore_error(block) {
28 try {
29 block
30 } catch(err) {
31
32 }
33 return this
34}
35
36def phabricator_apply_diff(phid, build_url, revision_id, diff_id) {
37 phabricator("harbormaster.createartifact", """buildTargetPHID: "$phid", artifactType: "uri", artifactKey: "$build_url", artifactData: { uri: "$build_url", name: "Velocity Results", "ui.external": true }""")
38 ignore_error {
39 phabricator("differential.revision.edit", """transactions: [{type: "reject", value: false}], objectIdentifier: "D$revision_id" """)
40 }
41 phabricator("harbormaster.sendmessage", """ buildTargetPHID: "$phid", type: "work" """)
42 sh "arc patch --diff $diff_id"
43}
44
45def phabricator(method, args) {
46 sh "jq -n '{ $args }' | arc call-conduit $method"
47 return this
48}
49
50def clean_git() {
51 sh "git checkout master && git branch | grep -v master | xargs git branch -D || true"
52 return this
53}
54
553// so we can use marathon.groovy later.
564def m
57/* END: Block of stuff that can be removed after the patch lands */
585
596ansiColor('gnome-terminal') {
607 node('JenkinsMarathonCI-Debian8-2017-03-21') {
61 if (fileExists('marathon.groovy')) {
628 m = load('marathon.groovy')
63 }
9
6410 // once the diff containing this has been submitted, the if statement above can be
6511 // removed and a lot of the function calls have to be prefixed with 'm'
6612 setBuildInfo("D$REVISION_ID($DIFF_ID) #$BUILD_NUMBER", "<a href=\"https://phabricator.mesosphere.com/D$REVISION_ID\">D$REVISION_ID</a>")
6713
6814 stage("Install Dependencies") {
6915 install_dependencies()
7016 }
7117 stage("Checkout D$REVISION_ID($DIFF_ID)") {
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s)
12066 } else {
12167 echo "No Unstable Tests \u2713"
12268 }
12369 }
12470 stage("Publish Results") {
12571 m.clean_git()
12672 m.phabricator_test_results("pass")
12773 icon = "\u221a"
128 if (currentBuild.result != "SUCCESS") {
129 icon = "\u26a0"
74 try {
75 m.phabricator("differential.revision.edit", """ transactions: [{type: "accept", value: true}, {type: "comment", value: "$icon Build of $DIFF_ID completed at $BUILD_URL"}], objectIdentifier: "D$REVISION_ID" """)
76 } catch (Exception err) {
77 m.phabricator("differential.revision.edit", """ transactions: [{type: "comment", value: "$icon Build of $DIFF_ID completed at $BUILD_URL"}], objectIdentifier: "D$REVISION_ID" """)
13078 }
131 m.phabricator("differential.revision.edit", """ transactions: [{type: "accept", value: true}, {type: "comment", value: "$icon Build of $DIFF_ID completed with ${currentBuild.result} at $BUILD_URL"}], objectIdentifier: "D$REVISION_ID" """)
13279 }
13380 } catch (Exception err) {
13481 stage("Publish Results") {
13582 m.clean_git()
13683 m.phabricator_test_results("fail")
84 try {
13785 m.phabricator("differential.revision.edit", """ transactions: [{type: "reject", value: true}, {type: "comment", value: "\u2717 Build of $DIFF_ID Failed at $BUILD_URL"}], objectIdentifier: "D$REVISION_ID" """)
86 } catch (Exception err) {
87 m.phabricator("differential.revision.edit", """ transactions: [{type: "comment", value: "\u2717 Build of $DIFF_ID Failed at $BUILD_URL"}], objectIdentifier: "D$REVISION_ID" """)
88 }
13889 m.currentBuild.result = "FAILURE"
13990 }
14091 }
14192 }
14293}
View Options

src/main/scala/mesosphere/marathon/BuildInfo.scala

11package mesosphere.marathon
22
33import java.util.jar.{ Attributes, Manifest }
44import scala.Predef._
55import scala.util.Try
66import scala.util.control.NonFatal
77
88case object BuildInfo {
9 lazy val DefaultMajor = 1
10 lazy val DefaultMinor = 5
11 lazy val DefaultPatch = 0
912
13 lazy val DefaultBuildVersion = s"$DefaultMajor.$DefaultMinor.$DefaultPatch-SNAPSHOT"
14
1015 lazy val manifest: Option[Manifest] = Try {
1116 val mf = new Manifest()
1217 mf.read(getClass().getClassLoader().getResourceAsStream("META-INF/MANIFEST.MF"))
1318 mf
1419 }.toOption
1520
1621 lazy val attributes: Option[Attributes] = manifest.map(_.getMainAttributes())
1722
1823 def getAttribute(name: String): Option[String] = attributes.flatMap { attrs =>
1924 try {
2025 Option(attrs.getValue(name))
2126 } catch {
2227 case NonFatal(_) => None
2328 }
2429 }
2530
2631 lazy val name: String = getAttribute("Implementation-Title").getOrElse("unknown")
2732
28 lazy val version: String = getAttribute("Implementation-Version").getOrElse("1.5.0-SNAPSHOT")
33 lazy val version: String = getAttribute("Implementation-Version").getOrElse(DefaultBuildVersion)
2934
3035 lazy val scalaVersion: String = getAttribute("Scala-Version").getOrElse("2.x.x")
3136
3237 lazy val buildref: String = getAttribute("Git-Commit").getOrElse("unknown")
3338
3439 override val toString: String = {
3540 "name: %s, version: %s, scalaVersion: %s, buildref: %s" format (
3641 name, version, scalaVersion, buildref
3742 )
3843 }
3944}
View Options

src/main/scala/mesosphere/marathon/storage/migration/Migration.scala

Show First 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s)
101101 case _ =>
102102 logger.info("No migration necessary, no version stored")
103103 await(storeCurrentVersion())
104104 Nil
105105 }
106106 migrations
107107 }.recover {
108108 case ex: MigrationFailedException => throw ex
109 case NonFatal(ex) => throw new MigrationFailedException(s"Migration Failed: ${ex.getMessage}", ex)
109 case NonFatal(ex) => throw new MigrationFailedException(s"Migration Failed: ${ex.getMessage} ${ex.getStackTrace.mkString}", ex)
110110 }
111111
112112 val migrations = Await.result(result, Duration.Inf)
113113 logger.info(s"Migration successfully applied for version ${StorageVersions.current.str}")
114114 migrations
115115 }
116116
117117 private def getCurrentVersion: Future[Option[StorageVersion]] =
Show All 23 Lines
141141
142142 def current: StorageVersion = {
143143 BuildInfo.version match {
144144 case VersionRegex(major, minor, patch) =>
145145 StorageVersions(
146146 major.toInt,
147147 minor.toInt,
148148 patch.toInt,
149 StorageVersion.StorageFormat.PERSISTENCE_STORE
150 )
151 case BuildInfo.DefaultBuildVersion =>
152 StorageVersions(
153 BuildInfo.DefaultMajor,
154 BuildInfo.DefaultMinor,
155 BuildInfo.DefaultPatch,
149156 StorageVersion.StorageFormat.PERSISTENCE_STORE
150157 )
151158 }
152159 }
153160
154161 implicit class OrderedStorageVersion(val version: StorageVersion) extends AnyVal with Ordered[StorageVersion] {
155162 override def compare(that: StorageVersion): Int = {
156163 def by(left: Int, right: Int, fn: => Int): Int = if (left.compareTo(right) != 0) left.compareTo(right) else fn
Show All 13 Lines
View Options

tests/pre-checkin.sh

  • This file was deleted.
This file was completely deleted. Show File Contents