		Path
D	M	Dockerfile (26 lines)
D	M	Dockerfile.build (45 lines)
D	M	Dockerfile.development (45 lines)
M		Jenkinsfile (43 lines)
M		Jenkinsfile.phab.groovy (31 lines)
D	M	bin/build-base-image.sh (26 lines)
D	M	bin/build-distribution (49 lines)
D	M	bin/marathon-framework (165 lines)
D	M	bin/start (94 lines)
M		build.sbt (185 lines)
M		changelog.md (11 lines)
M		marathon.groovy (121 lines)
D	M	packaging/Makefile (245 lines)
D	M	packaging/README.md (56 lines)
D	M	packaging/marathon (1 line)
D	M	packaging/marathon.conf (9 lines)
D	M	packaging/marathon.init (57 lines)
D	M	packaging/marathon.postinst (30 lines)
D	M	packaging/marathon.postrm (29 lines)
D	M	packaging/marathon.service (13 lines)
D	M	packaging/marathon.systemd.postinst (3 lines)
M		project/Dependencies.scala (8 lines)
M		project/plugins.sbt (9 lines)
A	M	scripts/publish_packages.sh (46 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	2658	b1e4ea7		Apr 13 2017, 2:06 AM	★	★
Diff 2	2659	b1e4ea7	- Remove obsolete stuff too	Apr 13 2017, 2:08 AM	★	★
Diff 3	2669	b1e4ea7	- Delete more unused/obsolete files and add some comments	Apr 13 2017, 6:14 PM	★	★
Diff 4	2670	b1e4ea7	- Adapt _some_ of the changes into the jenkinsfiles	Apr 13 2017, 6:30 PM	★	★
Diff 5	2674	b1e4ea7	- Remove obsolete stuff too	Apr 13 2017, 11:52 PM	★	★
Diff 6	2692	b1e4ea7	- Start testing RPM publishing	Apr 17 2017, 9:29 PM	★	★
Diff 7	2718	b1e4ea7	- Temporarily disable revolver	Apr 18 2017, 5:56 PM	★	★
Diff 8	2720	b1e4ea7	- Complete the cleanup	Apr 18 2017, 6:44 PM	★	★
Diff 9	2721	ebeedfc	- Rebase on master	Apr 18 2017, 7:45 PM	★	★
Diff 10	2723	b1e4ea7	- Bump the integration test timeout to an hour	Apr 18 2017, 9:37 PM	★	★
Diff 11	2724	b1e4ea7	- Run packaging in parallel, disable tests for iteration purposes	Apr 18 2017, 9:45 PM	★	★
Diff 12	2725	b1e4ea7	- Groovy syntax is confusing	Apr 18 2017, 9:55 PM	★	★
Diff 13	2726	b1e4ea7	- More syntax fixes to packaging	Apr 18 2017, 9:59 PM	★	★
Diff 14	2728	b1e4ea7	- Fix intellij's formatting, comment out a little more so testing works.	Apr 18 2017, 10:11 PM	★	★
Diff 15	2731	b1e4ea7	- Publish before posting results	Apr 18 2017, 10:37 PM	★	★
Diff 16	2734	b1e4ea7	- Verified the packages published, reenable everything and cleanup some if…	Apr 18 2017, 11:24 PM	★	★
Diff 17	2736	b1e4ea7	- Address Tim's Comments	Apr 19 2017, 12:01 AM	★	★
Diff 18	2737	b1e4ea7	- Correct the location to what we actually used to use	Apr 19 2017, 12:02 AM	★	★
Diff 19	2738	b1e4ea7	- Support all the different flavors of conf environment files we supported…	Apr 19 2017, 12:06 AM	★	★
Diff 20	2739	b1e4ea7	- Apparently /etc/marathon/conf was a directory?	Apr 19 2017, 12:13 AM	★	★
Diff 21	2740	b1e4ea7	- Revert the insanity, put it in the changelog and accept a PR if someone…	Apr 19 2017, 12:22 AM	★	★
Diff 22	2741	ebeedfc	Rebase, cleanup history and fix issue that Karsten raised and I missed again.	Apr 19 2017, 12:38 AM	★	★
Diff 23	2742	ebeedfc	Use a stable java8 base image.	Apr 19 2017, 12:40 AM	★	★
Diff 24	2753	08cd1ec	- Remove AMI changes, separate review	Apr 19 2017, 8:28 PM	★	★
Diff 25	2757	08cd1ec	rMARATHON94f16adc09dc8ecae03bcf3e0db593f30ecebc2d	Apr 19 2017, 10:11 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
a96d9658da65	9b5e8cbc29ce	0f669c91f47b	Jason Gilanfarr	- Address all review comments.	Apr 19 2017, 8:27 PM
0f669c91f47b	e34657338d4b	a19f6b12c27b	Jason Gilanfarr	Remove AMI changes, separate review	Apr 19 2017, 7:55 PM
a19f6b12c27b	96eb53aa60c9	08cd1ec7505d	Jason Gilanfarr	Package Marathon using sbt-native-packager (Show More…)	Apr 19 2017, 7:55 PM

Diff 2757

View Options

Dockerfile

This file was deleted.

This file was completely deleted. Show File Contents

View Options

Dockerfile.build

This file was deleted.

This file was completely deleted. Show File Contents

View Options

Dockerfile.development

This file was deleted.

This file was completely deleted. Show File Contents

View Options

Jenkinsfile

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Line(s)
50	50		// test run.
51	51		sh "sudo mv target/scala-2.11/scoverage-report/ target/scala-2.11/scoverage-report-integration"
52	52		sh "sudo mv target/scala-2.11/coverage-report/cobertura.xml target/scala-2.11/coverage-report/cobertura-integration.xml"
53	53		archiveArtifacts(
54	54		artifacts: 'target//coverage-report/cobertura-integration.xml, target//scoverage-report-integration/**',
55	55		allowEmptyArchive: true)
56	56		}
57	57		}
58			stage("4. Assemble Runnable Binaries") {
59			m.assembly()
60			}
61			stage("5. Package Binaries") {
	58		stage("4. Package Binaries") {
62	59		m.package_binaries()
63	60		}
64			stage("6. Run Unstable Tests") {
	61		stage("5. Run Unstable Tests") {
65	62		if (m.has_unstable_tests()) {
66	63		try {
67	64		m.unstable_test()
68	65		} catch (err) {
69	66		// For PRs, can we report it there somehow?
70	67		if (env.BRANCH_NAME.startsWith("releases/") \|\| env.BRANCH_NAME == "master") {
71	68		slackSend(message: "\u26a0 branch `${env.BRANCH_NAME}` failed in build `${env.BUILD_NUMBER}`. (<${env.BUILD_URL}\|Open>)",
72	69		color: "danger",
73	70		channel: "#marathon-dev",
74	71		tokenCredentialId: "f430eaac-958a-44cb-802a-6a943323a6a8")
75	72		}
76	73		}
77	74		}
78	75		}
79			stage("7. Archive Artifacts") {
	76		stage("6. Archive Artifacts") {
80	77		archiveArtifacts artifacts: 'target//classes/', allowEmptyArchive: true
81			archiveArtifacts artifacts: 'target/marathon-runnable.jar', allowEmptyArchive: true
82			archiveArtifacts artifacts: "target/marathon-${gitVersion}.tgz", allowEmptyArchive: false
	78		archiveArtifacts artifacts: 'target/universal/marathon-*.zip', allowEmptyArchive: false
	79		archiveArtifacts artifacts: 'target/universal/marathon-*.txz', allowEmptyArchive: false
		jeschkiesUnsubmitted Done In the revision description is says `target/packages/*`. What is the correct path?
		jasongilanfarrAuthorUnsubmitted Done Oh good catch, I need to verify this still. Plus I made an XZ too
83			archiveArtifacts artifacts: "packaging/marathon*.deb", allowEmptyArchive: false
84			archiveArtifacts artifacts: "packaging/marathon*.rpm", allowEmptyArchive: false
85			step([
86			$class: 'S3BucketPublisher',
87			entries: [[
88			sourceFile: "target/marathon-*.tgz",
89			bucket: 'marathon-artifacts',
90			selectedRegion: 'us-west-2',
91			noUploadOnFailure: true,
92			managedArtifacts: true,
93			flatten: true,
94			showDirectlyInBrowser: false,
95			keepForever: true,
96			]],
97			profileName: 'marathon-artifacts',
98			dontWaitForConcurrentBuildCompletion: false,
99			consoleLogLevel: 'INFO',
100			pluginFailureResultConstraint: 'FAILURE'
101			])
	80		archiveArtifacts artifacts: "taget/packages/*", allowEmptyArchive: false
102	81		}
103			// Only create latest-dev snapshot for master.
104			if (env.BRANCH_NAME == "master") {
105			stage("8. Publish Docker Image Snaphot") {
106			docker.image("mesosphere/marathon:${gitVersion}").tag("latest-dev")
107			docker.withRegistry("https://index.docker.io/v1/", "docker-hub-credentials") {
108			docker.image("mesosphere/marathon:latest-dev").push()
109			}
110			}
	82		stage("7. Publish Artifacts") {
	83		m.publish_artifacts()
111	84		}
112	85		} catch (Exception err) {
113	86		currentBuild.result = 'FAILURE'
114	87		if (env.BRANCH_NAME.startsWith("releases/") \|\| env.BRANCH_NAME == "master") {
115	88		slackSend(
116	89		message: "(;¬_¬) branch `${env.BRANCH_NAME}` failed in build `${env.BUILD_NUMBER}`. (<${env.BUILD_URL}\|Open>)",
117	90		color: "danger",
118	91		channel: "#marathon-dev",
Show All 21 Lines

View Options

Jenkinsfile.phab.groovy

1	1		#!/usr/bin/env groovy
2	2
	3		/*
	4		If you modify this file, you can't quite test it with the regular pipeline, instead,
	5		perform the following:
	6
	7		- Clone the current public-marathon-phabricator-pipeline as <user>-marathon-d<rev>
	8		- Push your branch and set the job to pull from your branch instead of master.
	9		- Switch the checkout stage to use "checkout scm" and copy the build parameters
	10		from a previous run of public-marathon-phabricator-pipeline for your diff. Now you
	11		can test whenever you'd like just by hitting rebuild.
	12		e.g.
	13		{{{
	14		stage("Checkout D$REVISION_ID($DIFF_ID)") {
	15		checkout scm
	16		m = load('marathon.groovy')
	17		}
	18		}}}
	19
	20		- Don't forget to push/update and undo the last piece before you submit.
	21		- If you need to test it against master too, name your branch with pipelines/ as a prefix.
	22		*/
	23
		timcharperUnsubmitted Done nice!
3	24		/* BEGIN: Things defined in marathon.groovy that have to be duplicated because we don't have marathon.groovy available at the time they are needed. */
4	25		// Install job-level dependencies that aren't specific to the build and
5	26		// can be required as part of checkout and should be applied before knowing
6	27		// the revision's information. e.g. JQ is required to post to phabricator.
7	28		// This should generally be fixed in the AMI, eventually.
8	29		// MARATHON-7026
9	30		def install_dependencies() {
10	31		sh "chmod 0600 ~/.arcrc"
11	32		// JQ is broken in the image
12	33		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"
13	34		// install ammonite (scala shell)
14	35		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"""
		zen-dogUnsubmitted Done Why doing it 2 times? In case the first one didn't work? ^.^
		jasongilanfarrAuthorUnsubmitted Done Operator fumbled at keyboard.
15	36		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"""
16	37		return this
17	38		}
18	39
19	40		def setBuildInfo(displayName, description) {
20	41		currentBuild.displayName = displayName
21	42		currentBuild.description = description
22	43		return this
▲ Show 20 Lines • Show All 56 Lines • ▼ Show 20 Line(s)
79	100		stage("Integration Test") {
80	101		try {
81	102		m.integration_test()
82	103		} finally {
83	104		m.phabricator_convert_test_coverage()
84	105		m.publish_test_coverage("Integration Test Coverage")
85	106		}
86	107		}
87			stage("Assemble Binaries") {
88			m.assembly()
89			}
90	108		stage("Package Binaries") {
91	109		m.package_binaries()
	110		}
	111		stage("Publish Artifacts") {
	112		if (env.PUBLISH_SNAPSHOT == "true") {
	113		m.publish_artifacts()
	114		} else {
	115		echo "Skipping Artifact Publishing, snapshot publishing not requested."
	116		}
92	117		}
93	118		stage("Unstable Test") {
94	119		if (m.has_unstable_tests()) {
95	120		m.ignore_error {
96	121		m.unstable_test()
97	122		}
98	123		m.phabricator_convert_test_coverage()
99	124		m.publish_test_coverage("Unstable Test Coverage")
Show All 28 Lines

View Options

bin/build-base-image.sh

This file was deleted.

Property	Old Value	New Value
File Mode	100755	null

This file was completely deleted. Show File Contents

View Options

bin/build-distribution

This file was deleted.

Property	Old Value	New Value
File Mode	100755	null

This file was completely deleted. Show File Contents

View Options

bin/marathon-framework

This file was deleted.

Property	Old Value	New Value
File Mode	100755	null

This file was completely deleted. Show File Contents

View Options

bin/start

This file was deleted.

Property	Old Value	New Value
File Mode	100755	null

This file was completely deleted. Show File Contents

View Options

build.sbt

	1		import java.time.ZoneOffset
	2		import java.time.format.DateTimeFormatter
	3		import java.time.LocalDate
	4
1	5		import com.amazonaws.auth.{EnvironmentVariableCredentialsProvider, InstanceProfileCredentialsProvider}
2	6		import com.typesafe.sbt.SbtScalariform.ScalariformKeys
3			import com.typesafe.sbt.packager.docker.ExecCmd
	7		import com.typesafe.sbt.packager.docker.Cmd
4	8		import mesosphere.raml.RamlGeneratorPlugin
5	9
6	10		import scalariform.formatter.preferences.{AlignArguments, AlignParameters, AlignSingleLineCaseStatements, CompactControlReadability, DanglingCloseParenthesis, DoubleIndentClassDeclaration, FormatXml, FormattingPreferences, IndentSpaces, IndentWithTabs, MultilineScaladocCommentsStartOnFirstLine, PlaceScaladocAsterisksBeneathSecondAsterisk, Preserve, PreserveSpaceBeforeArguments, SpaceBeforeColon, SpaceInsideBrackets, SpaceInsideParentheses, SpacesAroundMultiImports, SpacesWithinPatternBinders}
7	11
8	12		lazy val SerialIntegrationTest = config("serial-integration") extend Test
9	13		lazy val IntegrationTest = config("integration") extend Test
10	14		lazy val UnstableTest = config("unstable") extend Test
11	15		lazy val UnstableIntegrationTest = config("unstable-integration") extend Test
12	16
13	17		def formattingTestArg(target: File) = Tests.Argument("-u", target.getAbsolutePath, "-eDFG")
14	18
15	19		resolvers += Resolver.sonatypeRepo("snapshots")
16	20		addCompilerPlugin("org.psywerx.hairyfotr" %% "linter" % "0.1.17")
17	21
18			/**
19			* This on load trigger is used to set parameters in teamcity.
20			* It is only executed within teamcity and can be ignored otherwise.
21			* It will set values as build and env parameter.
22			* Those parameters can be used in subsequent build steps and dependent builds.
23			* TeamCity does this by watching the output of the build it currently performs.
24			* See: https://confluence.jetbrains.com/display/TCD8/Build+Script+Interaction+with+TeamCity
25			*/
26			lazy val teamCitySetEnvSettings = Seq(
27			onLoad in Global := {
28			sys.env.get("TEAMCITY_VERSION") match {
29			case None => // no-op
30			case Some(teamcityVersion) =>
31			def reportParameter(key: String, value: String): Unit = {
32			//env parameters will be made available as environment variables
33			println(s"##teamcity[setParameter name='env.SBT_$key' value='$value']")
34			//system parameters will be made available as teamcity build parameters
35			println(s"##teamcity[setParameter name='system.sbt.$key' value='$value']")
36			}
37			reportParameter("SCALA_VERSION", scalaVersion.value)
38			reportParameter("PROJECT_VERSION", version.value)
39			}
40			(onLoad in Global).value
41			}
42			)
43
44	22		lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq(
45	23		ScalariformKeys.preferences := FormattingPreferences()
46	24		.setPreference(AlignArguments, false)
47	25		.setPreference(AlignParameters, false)
48	26		.setPreference(AlignSingleLineCaseStatements, false)
49	27		.setPreference(CompactControlReadability, false)
50	28		.setPreference(DoubleIndentClassDeclaration, true)
51	29		.setPreference(DanglingCloseParenthesis, Preserve)
Show All 24 Lines
76	54		"-target:jvm-1.8",
77	55		"-deprecation",
78	56		"-feature",
79	57		"-unchecked",
80	58		"-Xfuture",
81	59		"-Xlog-reflective-calls",
82	60		"-Xlint",
83	61		//FIXME: CORE-977 and MESOS-7368 are filed and need to be resolved to re-enable this
84	62		// "-Xfatal-warnings",
		timcharperUnsubmitted Done I'm so bummed about this
		jasongilanfarrAuthorUnsubmitted Done That's not actually in my change, it came in during the rebase. I'm super sad too.
85	63		"-Yno-adapted-args",
86	64		"-Ywarn-numeric-widen",
87	65		//"-Ywarn-dead-code", We should turn this one on soon
88	66		"-Ywarn-inaccessible",
89	67		"-Ywarn-infer-any",
90	68		"-Ywarn-nullary-override",
91	69		"-Ywarn-nullary-unit",
92	70		//"-Ywarn-unused", We should turn this one on soon
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Line(s)
178	156		javacOptions in Compile += "-g",
179	157		javaOptions in run ++= (AspectjKeys.weaverOptions in Aspectj).value,
180	158		javaOptions in Test ++= (AspectjKeys.weaverOptions in Aspectj).value,
181	159		git.useGitDescribe := true,
182	160		// TODO: There appears to be a bug where uncommitted changes is true even if nothing is committed.
183	161		git.uncommittedSignifier := None
184	162		)
185	163
186			val aopMerge: sbtassembly.MergeStrategy = new sbtassembly.MergeStrategy {
187			val name = "aopMerge"
188			import scala.xml._
189			import scala.xml.dtd._
190	164
191			def apply(tempDir: File, path: String, files: Seq[File]): Either[String, Seq[(File, String)]] = {
192			val dt = DocType("aspectj", PublicID("-//AspectJ//DTD//EN", "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"), Nil)
193			val file = MergeStrategy.createMergeTarget(tempDir, path)
194			val xmls: Seq[Elem] = files.map(XML.loadFile)
195			val aspectsChildren: Seq[Node] = xmls.flatMap(_ \\ "aspectj" \ "aspects" \ "_")
196			val weaverChildren: Seq[Node] = xmls.flatMap(_ \\ "aspectj" \ "weaver" \ "_")
197			val options: String = xmls.map(x => (x \\ "aspectj" \ "weaver" \ "@options").text).mkString(" ").trim
198			val weaverAttr = if (options.isEmpty) Null else new UnprefixedAttribute("options", options, Null)
199			val aspects = new Elem(null, "aspects", Null, TopScope, false, aspectsChildren: _*)
200			val weaver = new Elem(null, "weaver", weaverAttr, TopScope, false, weaverChildren: _*)
201			val aspectj = new Elem(null, "aspectj", Null, TopScope, false, aspects, weaver)
202			XML.save(file.toString, aspectj, "UTF-8", xmlDecl = false, dt)
203			IO.append(file, IO.Newline.getBytes(IO.defaultCharset))
204			Right(Seq(file -> path))
205			}
206			}
	165		lazy val packageDebianUpstart = taskKey[File]("Create debian upstart package")
	166		lazy val packageDebianSystemV = taskKey[File]("Create debian systemv package")
	167		lazy val packageDebianSystemd = taskKey[File]("Create debian systemd package")
	168		lazy val packageRpmSystemV = taskKey[File]("Create rpm systemv package")
	169		lazy val packageRpmSystemd = taskKey[File]("create rpm systemd package")
207	170
208			// TODO: Move away from sbt-assembly, favoring sbt-native-packager
209			lazy val asmSettings = Seq(
210			assemblyMergeStrategy in assembly := {
211			case "application.conf" => MergeStrategy.concat
212			case "META-INF/jersey-module-version" => MergeStrategy.first
213			case "META-INF/aop.xml" => aopMerge
214			case "org/apache/hadoop/yarn/util/package-info.class" => MergeStrategy.first
215			case "org/apache/hadoop/yarn/factories/package-info.class" => MergeStrategy.first
	171		lazy val packagingSettings = Seq(
	172		packageSummary := "Scheduler for Apache Mesos",
	173		packageDescription := "Cluster-wide init and control system for services running on\\\n\tApache Mesos",
	174		maintainer := "Mesosphere Package Builder <support@mesosphere.io>",
	175		debianPackageDependencies in Debian := Seq("java8-runtime-headless", "lsb-release", "unzip", s"mesos (>= ${Dependency.V.MesosDebian})"),
	176		rpmVendor := "mesosphere",
	177		rpmLicense := Some("Apache 2"),
	178		version in Rpm := {
		jeschkiesUnsubmitted Done Where is the Debian package version set?
		jasongilanfarrAuthorUnsubmitted Done It just takes the normal version. Debian doesn't have the weird naming requirements rpm has. I'm still trying to verify if this is correct too :/ but rpm seems fine with it.
216			case "org/apache/hadoop/yarn/factory/providers/package-info.class" => MergeStrategy.first
217			case x => (assemblyMergeStrategy in assembly).value(x)
	179		val releasePattern = """^(\d+)\.(\d+)\.(\d+)$""".r
	180		val snapshotPattern = """^(\d+).(\d+)\.(\d+)-SNAPSHOT-\d+-g(\w+)""".r
	181		version.value match {
	182		case releasePattern(major, minor, patch) => s"$major.$minor.$patch"
	183		case snapshotPattern(major, minor, patch, commit) => s"$major.$minor.$patch${LocalDate.now(ZoneOffset.UTC).format(DateTimeFormatter.BASIC_ISO_DATE)}git$commit"
	184		}
218	185		},
219			assemblyExcludedJars in assembly := {
220			val exclude = Set(
221			"commons-beanutils-1.7.0.jar",
222			"stax-api-1.0.1.jar",
	186		daemonStdoutLogFile := None,
	187		debianChangelog in Debian := Some(baseDirectory.value / "changelog.md"),
	188		rpmRequirements in Rpm := Seq("coreutils", "unzip", "java >= 1:1.8.0"),
	189		dockerBaseImage := Dependency.V.OpenJDK,
		jeschkiesUnsubmitted Not Done Please specify the exact patch version as in the Dockerfile: `openjdk:8u121-jdk`. This way it is easier to track.
		jasongilanfarrAuthorUnsubmitted Done Hmm, I'm a bit on the fence on this one. 8-jdk essentially gets us security updates automatically...
		timcharperUnsubmitted Done .... and unpredictable builds. JDK has had regressions in the past.
		aquamatthiasUnsubmitted Not Done Perhaps we should define this version in `Dependencies` as well? That way it is not "hidden"
		jeschkiesUnsubmitted Not Done +1 on that.
		jasongilanfarrAuthorUnsubmitted Not Done I'm good with that.
223			"commons-beanutils-core-1.8.0.jar",
224			"servlet-api-2.5.jar",
225			"jsp-api-2.1.jar"
226			)
227			(fullClasspath in assembly).value.filter { x => exclude(x.data.getName) }
	190		dockerExposedPorts := Seq(8080),
	191		dockerRepository := Some("mesosphere"),
	192		daemonUser in Docker := "root",
	193		dockerCommands ++= Seq(
	194		Cmd("RUN", "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E56151BF && " +
	195		"echo deb http://repos.mesosphere.com/debian jessie-testing main \| tee -a /etc/apt/sources.list.d/mesosphere.list && " +
	196		"echo deb http://repos.mesosphere.com/debian jessie main \| tee -a /etc/apt/sources.list.d/mesosphere.list && " +
	197		"apt-get update && " +
	198		s"apt-get install --no-install-recommends -y --force-yes mesos=${Dependency.V.MesosDebian} && " +
	199		"apt-get clean"
	200		),
	201		Cmd("RUN", "chown -R daemon:daemon ."),
	202		Cmd("USER", "daemon")
	203		),
	204		bashScriptExtraDefines +=
	205		"""
	206		\|for env_op in `env \| grep -v ^MARATHON_APP \| grep ^MARATHON_ \| awk '{gsub(/MARATHON_/,""); gsub(/=/," "); printf("%s%s ", "--", tolower($1)); for(i=2;i<=NF;i++){printf("%s ", $i)}}'`; do
		aquamatthiasUnsubmitted Done I see the env vars handling, but I think we miss: files in `/etc/marathon/conf` are converted to paramaters (file xxx with content yyy --> `--xxx yyy`) /etc/default/marathon is read and exported into env Please see `bin/marathon_framework` for reference
		jasongilanfarrAuthorUnsubmitted Done Another great benefit of Native-Packager. It actually does all of this for us, `EnvironmentFile` is `/etc/default/marathon` (in systemd), in upstart/sysv init its the same file and the script handles that. I have no objection to adding `/etc/marathon/conf` too... not sure what the lsb standards are for the different package formats are....
		timcharperUnsubmitted Done As long as we don't modify behavior for 1.4.x (I think we should keep packager the same) then I think reducing the number of files to configure Marathon is positive. However, we should try and deprecate it. All we should need to do is check for the file and source it if it exists as part of the bashScriptExtraDefines above.
		jasongilanfarrAuthorUnsubmitted Done I moved this over to the changelog. I think longer term, we should throw away this cli parameter stuff and just use typesafe config + environment variables (via config), but that's a totally unrelated change.
	207		\| addApp "$env_op"
	208		\|done
	209		""".stripMargin,
	210		packageDebianUpstart := {
	211		val debianFile = (packageBin in Debian).value
	212		val output = target.value / "packages" / s"upstart-${debianFile.getName}"
	213		IO.move(debianFile, output)
	214		streams.value.log.info(s"Moved debian ${(serverLoading in Debian).value} package $debianFile to $output")
	215		output
228	216		},
229			test in assembly := {}
	217		packageDebianSystemV := {
	218		val debianFile = (packageBin in Debian).value
	219		val output = target.value / "packages" / s"sysvinit-${debianFile.getName}"
	220		IO.move(debianFile, output)
	221		streams.value.log.info(s"Moved debian ${(serverLoading in Debian).value} package $debianFile to $output")
	222		output
	223		},
	224		packageDebianSystemd := {
	225		val debianFile = (packageBin in Debian).value
	226		val output = target.value / "packages" / s"systemd-${debianFile.getName}"
	227		IO.move(debianFile, output)
	228		streams.value.log.info(s"Moving debian ${(serverLoading in Debian).value} package $debianFile to $output")
	229		output
	230		},
	231		packageRpmSystemV := {
	232		val rpmFile = (packageBin in Rpm).value
	233		val output = target.value / "packages" / s"sysvinit-${rpmFile.getName}"
	234		IO.move(rpmFile, output)
	235		streams.value.log.info(s"Moving rpm ${(serverLoading in Rpm).value} package $rpmFile to $output")
	236		output
	237		},
	238		packageRpmSystemd := {
	239		val rpmFile = (packageBin in Rpm).value
	240		val output = target.value / "packages" / s"systemd-${rpmFile.getName}"
	241		IO.move(rpmFile, output)
	242		streams.value.log.info(s"Moving rpm ${(serverLoading in Rpm).value} package $rpmFile to $output")
	243		output
	244		},
	245		mappings in (Compile, packageDoc) := Seq()
230	246		)
231	247
232			lazy val packagingSettings = Seq(
233			dockerBaseImage in Docker := "openjdk:8u121-jdk",
234			dockerExposedPorts in Docker := Seq(8080),
235			dockerRepository in Docker := Some("mesosphere"),
236			dockerCommands ++= Seq(
237			ExecCmd("RUN", "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E56151BF && \\" +
238			"echo \"deb http://repos.mesosphere.com/debian jessie-testing main\" \| tee -a /etc/apt/sources.list.d/mesosphere.list && \\" +
239			"echo \"deb http://repos.mesosphere.com/debian jessie main\" \| tee -a /etc/apt/sources.list.d/mesosphere.list && \\" +
240			"apt-get update && \\" +
241			s"apt-get install --no-install-recommends -y --force-yes mesos=${Dependency.V.MesosDebian} && \\" +
242			"apt-get clean")
243			)
244			)
	248		addCommandAlias("packageAll", ";universal:packageBin; universal:packageXzTarball; docker:publishLocal; packageDebian; packageRpm")
245	249
	250		addCommandAlias("packageDebian", ";set serverLoading in Debian := com.typesafe.sbt.packager.archetypes.ServerLoader.SystemV" +
	251		";packageDebianSystemV" +
	252		";set serverLoading in Debian := com.typesafe.sbt.packager.archetypes.ServerLoader.Upstart" +
	253		";packageDebianUpstart" +
	254		";set serverLoading in Debian := com.typesafe.sbt.packager.archetypes.ServerLoader.Systemd" +
	255		";packageDebianSystemd")
	256
	257		addCommandAlias("packageRpm", ";set serverLoading in Rpm := com.typesafe.sbt.packager.archetypes.ServerLoader.SystemV" +
	258		";packageRpmSystemV" +
	259		";set serverLoading in Rpm := com.typesafe.sbt.packager.archetypes.ServerLoader.Systemd" +
	260		";packageRpmSystemd")
	261
	262
246	263		lazy val `plugin-interface` = (project in file("plugin-interface"))
247	264		.enablePlugins(GitBranchPrompt, CopyPasteDetector, BasicLintingPlugin)
248	265		.configs(SerialIntegrationTest)
249	266		.configs(IntegrationTest)
250	267		.configs(UnstableTest)
251	268		.configs(UnstableIntegrationTest)
252	269		.settings(commonSettings : _*)
253	270		.settings(formatSettings : _*)
254	271		.settings(
255	272		name := "plugin-interface",
256	273		libraryDependencies ++= Dependencies.pluginInterface
257	274		)
258	275
259	276		lazy val marathon = (project in file("."))
260	277		.configs(SerialIntegrationTest)
261	278		.configs(IntegrationTest)
262	279		.configs(UnstableTest)
263	280		.configs(UnstableIntegrationTest)
264			.enablePlugins(GitBranchPrompt, JavaServerAppPackaging, DockerPlugin,
	281		.enablePlugins(GitBranchPrompt, JavaServerAppPackaging, DockerPlugin, DebianPlugin, RpmPlugin, JDebPackaging,
265	282		CopyPasteDetector, RamlGeneratorPlugin, BasicLintingPlugin, GitVersioning)
266	283		.dependsOn(`plugin-interface`)
267	284		.settings(commonSettings: _*)
268	285		.settings(formatSettings: _*)
269			.settings(teamCitySetEnvSettings: _*)
270			.settings(asmSettings: _*)
	286		.settings(packagingSettings: _*)
271	287		.settings(
272	288		unmanagedResourceDirectories in Compile += file("docs/docs/rest-api"),
273	289		libraryDependencies ++= Dependencies.marathon,
274	290		sourceGenerators in Compile += (ramlGenerate in Compile).taskValue,
275	291		scapegoatIgnoredFiles ++= Seq(s"${sourceManaged.value.getPath}/.*"),
276	292		mainClass in Compile := Some("mesosphere.marathon.Main"),
277	293		packageOptions in (Compile, packageBin) ++= Seq(
278	294		Package.ManifestAttributes("Implementation-Version" -> version.value ),
279	295		Package.ManifestAttributes("Scala-Version" -> scalaVersion.value ),
280	296		Package.ManifestAttributes("Git-Commit" -> git.gitHeadCommit.value.getOrElse("unknown") )
281	297		)
282	298		)
	299
283	300
284	301		lazy val `mesos-simulation` = (project in file("mesos-simulation"))
285	302		.configs(SerialIntegrationTest)
286	303		.configs(IntegrationTest)
287	304		.configs(UnstableTest)
288	305		.configs(UnstableIntegrationTest)
289	306		.enablePlugins(GitBranchPrompt, CopyPasteDetector, BasicLintingPlugin)
290	307		.settings(commonSettings: _*)
Show All 21 Lines

View Options

changelog.md

1	1	## Changes from 1.4.x to 1.5.0 (unreleased)
2	2
3	3	### Breaking Changes
4	4
	5	#### Packaging standardized
	6
	7	We now publish more normalized packages that attempt to follow Linux Standard Base Guidelines and use sbt-native-packager to achieve this.
	8	As a result of this and the many historic ways of passing options into marathon, we will only read `/etc/default/marathon` when starting up.
	9	This file, like `/etc/sysconfig/marathon`, has all marathon command line options as "MARATHON_XXX=YYY" which will translate to `--xx=yyy`.
	10	We no longer support /etc/marathon/conf which was a set of files that would get translated into command line arguments. In addition,
	11	we no longer assume that if there is no zk/master argument passed in, then both are running on localhost.
	12
	13	If support for any of the above is important to you, please file a JIRA and/or create a PR/Patch.
	14
	15
5	16	#### App JSON Fields Changed or Moved.
6	17
7	18	Marathon will continue to accept the app JSON as it did in 1.4;
8	19	however, applications that use deprecated fields will be normalized into a canonical representation.
9	20	The app JSON generated by the /v2 REST API has changed: only canonical fields are generated.
10	21	The [App RAML specification](docs/docs/rest-api/public/api/v2/types/app.raml) is the source of truth with respect to deprecated fields.
11	22	The following deprecated fields will no longer be generated for app JSON:
12	23
▲ Show 20 Lines • Show All 1983 Lines • Show Last 20 Lines

View Options

marathon.groovy

1	1	// Libraries of methods for testing Marathon in jenkins
2	2
3	3	def ignore_error(block) {
4	4	try {
5	5	block()
6		} catch(err) {
	6	} catch (err) {
7	7
8	8	}
9	9	return this
10	10	}
11	11
12	12	// Add a prefix to all of the JUnit result files listed
13	13	// This is particularly useful for tagging things like "UNSTABLE.${TestName}"
14	14	def mark_unstable_results(dirs) {
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Line(s)
85	85	// the revision's information. e.g. JQ is required to post to phabricator.
86	86	// This should generally be fixed in the AMI, eventually.
87	87	// MARATHON-7026
88	88	def install_dependencies() {
89	89	sh "chmod 0600 ~/.arcrc"
90	90	// JQ is broken in the image
91	91	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"
92	92	// install ammonite (scala shell)
93		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"""
94	93	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"""
95	94	return this
96	95	}
97	96
98	97	def setBuildInfo(displayName, description) {
99	98	currentBuild.displayName = displayName
100	99	currentBuild.description = description
101	100	return this
Show All 32 Lines
134	133	}
135	134	} finally {
136	135	junit allowEmptyResults: true, testResults: 'target/test-reports/*/.xml'
137	136	}
138	137	}
139	138
140	139	def integration_test() {
141	140	try {
142		timeout(time: 30, unit: 'MINUTES') {
	141	timeout(time: 60, unit: 'MINUTES') {
143	142	withEnv(['RUN_DOCKER_INTEGRATION_TESTS=true', 'RUN_MESOS_INTEGRATION_TESTS=true']) {
144	143	STATUS = sh(script: """sudo -E sbt -Dsbt.log.format=false '; clean; coverage; integration:test; mesos-simulation/integration:test' """, returnStatus: true)
145	144	sh """sudo -E sbt -Dsbt.log.format=false '; set coverageFailOnMinimum := false; coverageReport'"""
146	145	if (STATUS != 0) {
147	146	error "Integration Tests Failed"
148	147	}
149	148	}
150	149	}
Show All 22 Lines
173	172	} finally {
174	173	mark_unstable_results("target/test-reports/unstable-integration target/test-reports/unstable")
175	174	junit allowEmptyResults: true, testResults: 'target/test-reports/unstable-integration/*/.xml'
176	175	junit allowEmptyResults: true, testResults: 'target/test-reports/unstable/*/.xml'
177	176	}
178	177	}
179	178
180	179	def assembly() {
181		sh "sudo -E sbt assembly"
182		sh "sudo bin/build-distribution"
	180	return this
183	181	}
184	182
185	183	def package_binaries() {
186		gitVersion = sh(returnStdout: true, script: 'git describe --tags --always').trim()
	184	sh("sudo rm -f target/packages/*")
	185	sh("sudo sbt packageAll")
	186	return this
	187	}
187	188
	189	def is_phabricator_build() {
	190	return "".equals(env.DIFF_ID)
	191	}
	192
	193	def is_release_build(gitTag) {
	194	if (gitTag.contains("SNAPSHOT") \|\| gitTag.contains("g")) {
	195	return false
	196	} else if (env.BRANCH_NAME == null) {
	197	return false
	198	} else if (env.BRANCH_NAME.startsWith("releases/")) {
	199	return true
	200	}
	201	}
	202
	203	def publish_artifacts() {
	204	gitTag = sh(returnStdout: true, script: "git describe --tags --always").trim().replaceFirst("v", "")
	205
188	206	parallel(
189		"Tar Binaries": {
190		sh """sudo tar -czv -f "target/marathon-${gitVersion}.tgz" \
191		Dockerfile \
192		README.md \
193		LICENSE \
194		bin \
195		examples \
196		docs \
197		target/scala-2./marathon-assembly-.jar
198		"""
	207	docker: {
	208	// Only create latest-dev snapshot for master.
	209	// TODO: Docker 1.12 doesn't support tag -f and the jenkins docker plugin still passes it in.
	210	if (env.BRANCH_NAME == "master" && !is_phabricator_build()) {
	211	sh "docker tag mesosphere/marathon:${gitTag} mesosphere/marathon:latest-dev"
	212	docker.withRegistry("https://index.docker.io/v1/", "docker-hub-credentials") {
	213	sh "docker push mesosphere/marathon:latest-dev"
	214	}
	215	} else if (env.PUBLISH_SNAPSHOT == "true" \|\| (is_release_build(gitTag) && !is_phabricator_build())) {
	216	docker.withRegistry("https://index.docker.io/v1/", "docker-hub-credentials") {
	217	sh "docker push mesosphere/marathon:${gitTag}"
	218	}
	219	}
199	220	},
200		"Create Debian and Red Hat Package": {
201		dir("packaging") {
202		sh "sudo make all"
	221	s3: {
	222	if (env.BRANCH_NAME == "master" \|\| env.PUBLISH_SNAPSHOT == "true" \|\| is_release_build(gitTag)) {
	223	storageClass = "STANDARD_IA"
	224	// TODO: we could use marathon-artifacts for both profile and buckets, but we would
	225	// need to either setup a bucket policy for public-read on the s3://marathon-artifacts/snapshots
	226	// We should probably prefer downloads as this allows us to share snapshot builds
	227	// with anyone. The directory listing isn't public anyways.
	228	profile = "aws-production"
	229	bucket = "downloads.mesosphere.io/marathon/snapshots/"
	230
	231	if (is_release_build(gitTag)) {
	232	storageClass = "STANDARD"
	233	bucket = "downloads.mesosphere.io/marathon/${gitTag}/"
203	234	}
	235	step([
	236	$class: 'S3BucketPublisher',
	237	entries: [[
	238	sourceFile: "target/universal/marathon-*.txz",
	239	bucket: bucket,
	240	selectedRegion: 'us-west-2',
	241	noUploadOnFailure: true,
	242	managedArtifacts: false,
	243	flatten: true,
	244	showDirectlyInBrowser: true,
	245	keepForever: true,
	246	storageClass: storageClass,
	247	],
	248	[
	249	sourceFile: "target/universal/marathon-*.zip",
	250	bucket: bucket,
	251	selectedRegion: 'us-west-2',
	252	noUploadOnFailure: true,
	253	managedArtifacts: false,
	254	flatten: true,
	255	showDirectlyInBrowser: true,
	256	keepForever: true,
	257	storageClass: storageClass,
	258	],
	259	],
	260	profileName: profile,
	261	dontWaitForConcurrentBuildCompletion: false,
	262	consoleLogLevel: 'INFO',
	263	pluginFailureResultConstraint: 'FAILURE'
	264	])
	265	}
204	266	},
205		"Build Docker Image": {
206		// target is in .dockerignore so we just copy the jar before.
207		sh "cp target//marathon-assembly-.jar ."
208		mesosVersion = sh(returnStdout: true, script: "sed -n 's/^.MesosDebian = \"\$.\$\"/\\1/p' <./project/Dependencies.scala").trim()
209		docker.build("mesosphere/marathon:${gitVersion}", "--build-arg MESOS_VERSION=${mesosVersion} .")
	267	nativePackages: {
	268	if (env.BRANCH_NAME == "master" \|\| env.PUBLISH_SNAPSHOT == "true" \|\| is_release_build(gitTag)) {
	269	sshagent(credentials: ['0f7ec9c9-99b2-4797-9ed5-625572d5931d']) {
	270	echo "Uploading Artifacts to package server"
	271	// we rsync a directory first, then copy over the binaries into specific folders so
	272	// that the cron job won't try to publish half-uploaded RPMs/DEBs
	273	sh """ssh -o StrictHostKeyChecking=no pkgmaintainer@repo1.hw.ca1.mesosphere.com "mkdir -p ~/repo/incoming/marathon-${gitTag}" """
	274	sh "rsync -avzP target/packages/${gitTag} target/packages/*.rpm pkgmaintainer@repo1.hw.ca1.mesosphere.com:~/repo/incoming/marathon-${gitTag}"
	275	sh """ssh -o StrictHostKeyChecking=no -o BatchMode=yes pkgmaintainer@repo1.hw.ca1.mesosphere.com "env GIT_TAG=${gitTag} bash -s --" < scripts/publish_packages.sh """
	276	sh """ssh -o StrictHostKeyChecking=no -o BatchMode=yes pkgmaintainer@repo1.hw.ca1.mesosphere.com "rm -rf ~/repo/incoming/marathon-${gitTag}" """
210	277	}
211		)
	278	}
	279	})
	280	return this
212	281	}
213	282
214	283	/**
215	284	* Execute block and set GitHub commit status to success or failure if block
216	285	* throws an exception.
217	286	*
218	287	* @param label The context for the commit status.
219	288	* @param block The block to execute.
Show All 37 Lines

View Options

packaging/Makefile

This file was deleted.

This file was completely deleted. Show File Contents

View Options

packaging/README.md

This file was deleted.

This file was completely deleted. Show File Contents

View Options

packaging/marathon

This file was deleted.

Property	Old Value	New Value
File Mode	120000	null

This file was completely deleted. Show File Contents

View Options

packaging/marathon.conf

This file was deleted.

This file was completely deleted. Show File Contents

View Options

packaging/marathon.init

This file was deleted.

Property	Old Value	New Value
File Mode	100755	null

This file was completely deleted. Show File Contents

View Options

packaging/marathon.postinst

This file was deleted.

This file was completely deleted. Show File Contents

View Options

packaging/marathon.postrm

This file was deleted.

This file was completely deleted. Show File Contents

View Options

packaging/marathon.service

This file was deleted.

This file was completely deleted. Show File Contents

View Options

packaging/marathon.systemd.postinst

This file was deleted.

This file was completely deleted. Show File Contents

View Options

project/Dependencies.scala

1	1	import sbt.ExclusionRule
2	2	import sbt._
3	3
4	4	object Dependencies {
5	5	import Dependency._
6	6
7	7	val pluginInterface = Seq(
8	8	playJson % "compile",
9	9	mesos % "compile",
10	10	guava % "compile",
11	11	wixAccord % "compile",
12	12	scalaxml % "provided" // for scapegoat
13	13	)
14	14
15	15	val excludeSlf4jLog4j12 = ExclusionRule(organization = "org.slf4j", name = "slf4j-log4j12")
16		val excludeLog4j = ExclusionRule(organization = "log4j")
17		val excludeJCL = ExclusionRule(organization = "commons-logging")
18		val excludeAkkaHttpExperimental = ExclusionRule(name = "akka-http-experimental_2.11")
	16	val excludeLog4j = ExclusionRule(organization = "log4j", name = "log4j")
	17	val excludeJCL = ExclusionRule(organization = "commons-logging", name = "commons-logging")
	18	val excludeAkkaHttpExperimental = ExclusionRule(organization = "com.typesafe.akka", name = "akka-http-experimental_2.11")
19	19
20	20	val marathon = (Seq(
21	21	// runtime
22	22	akkaActor % "compile",
23	23	akkaSlf4j % "compile",
24	24	akkaStream % "compile",
25	25	akkaHttp % "compile",
26	26	asyncAwait % "compile",
▲ Show 20 Lines • Show All 49 Lines • ▼ Show 20 Line(s)
76	76	}
77	77
78	78	object Dependency {
79	79	object V {
80	80	// runtime deps versions
81	81	val Alpakka = "0.6"
82	82	val Chaos = "0.8.8"
83	83	val Guava = "19.0"
84		// FIXME (gkleiman): reenable deprecation checks after Mesos 1.0.0-rc2 deprecations are handled
85	84	val Mesos = "1.2.0"
86	85	// Version of Mesos to use in Dockerfile.
87	86	val MesosDebian = "1.2.0-2.0.6"
	87	val OpenJDK = "openjdk:8u121-jdk"
88	88	val Akka = "2.4.17"
89	89	val ApacheCommonsCompress = "1.13"
90	90	val ApacheCommonsIO = "2.4"
91	91	val AsyncAwait = "0.9.6"
92	92	val Jersey = "1.18.5"
93	93	val JettyServlets = "9.3.6.v20151106"
94	94	val JodaTime = "2.9.7"
95	95	val JodaConvert = "1.8.1"
▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines

View Options

project/plugins.sbt

1	1	resolvers ++= Seq(
2	2	Resolver.typesafeRepo("releases"),
3	3	Resolver.sonatypeRepo("releases"),
4	4	Resolver.sonatypeRepo("snapshots"),
5	5	Classpaths.sbtPluginReleases,
6	6	"Era7 maven releases" at "http://releases.era7.com.s3.amazonaws.com"
7	7	)
8	8
9		addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
10	9	addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
11	10	addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
12	11	addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
13	12	addSbtPlugin("ohnosequences" % "sbt-s3-resolver" % "0.15.0")
14	13	addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
15	14	addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")
16	15	addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.2.0")
17	16	addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "1.0.0")
18	17	addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
19		addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1")
	18	addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.5")
20	19	addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.0.4")
21	20	addSbtPlugin("de.johoop" % "cpd4sbt" % "1.2.0")
22	21	addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.15")
23	22	addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.10.6")
	23	addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
24	24
	25
25	26	libraryDependencies ++= Seq(
26	27	"org.raml" % "raml-parser-2" % "1.0.0",
27	28	"com.eed3si9n" %% "treehugger" % "0.4.1",
28		"org.slf4j" % "slf4j-nop" % "1.7.22"
	29	"org.slf4j" % "slf4j-nop" % "1.7.22",
	30	"org.vafer" % "jdeb" % "1.3" artifacts Artifact("jdeb", "jar", "jar")
29	31	)
30	32
31	33	sbtPlugin := true
32

View Options

scripts/publish_packages.sh

This file was added.

1		#!/usr/bin/env bash
2
	timcharperUnsubmitted Done Solid reason to use this and not /bin/bash ?
	jasongilanfarrAuthorUnsubmitted Done i normally hard code then other reviews said "use env" instead. So i used env.
3		# This file should run on the package server itself to move
4		# the packages into the correct distro directories.
5		# All the files have been copied into the package server
6		# where a cron job will scan incoming, sign the packages, publish
7		# into S3, etc every 5min.
8
9		set -e -o pipefail
10
11		cd repo/incoming/marathon-${GIT_TAG}
	timcharperUnsubmitted Done Nit - this can be done on one line set -e -o pipefail
	jasongilanfarrAuthorUnsubmitted Done true.
12
13		PKG_TYPE=""
14		case "$GIT_TAG" in
15		SNAPSHOT) PKG_TYPE="-unstable";;
16		RC) PKG_TYPE="-testing";;
17		esac
18
19
20		echo "Publishing marathon with ${GIT_TAG} to ${PKG_TYPE}"
21
22		# Debian 8
23		cp systemd-marathon*.deb $HOME/repo/incoming/debian/jessie${PKG_TYPE}/
24		# Debian 9
25		# we don't actually use stretch yet
26		# cp systemd-marathon*.deb $HOME/repo/incoming/debian/stretch${PKG_TYPE}/
27
28
29		# Ubuntu 16.04
30		cp systemd-marathon*.deb $HOME/repo/incoming/ubuntu/yakkety${PKG_TYPE}/
31		# Ubuntu 16.10
32		cp systemd-marathon*.deb $HOME/repo/incoming/ubuntu/xenial${PKG_TYPE}/
33		# Ubuntu 15.10
34		cp systemd-marathon*.deb $HOME/repo/incoming/ubuntu/wily${PKG_TYPE}/
35		# Ubuntu 15.04
36		cp systemd-marathon*.deb $HOME/repo/incoming/ubuntu/vivid${PKG_TYPE}/
37		# Ubuntu 14.04
38		cp upstart-marathon*.deb $HOME/repo/incoming/ubuntu/trusty${PKG_TYPE}/
39		# Ubuntu 12.04
40		cp upstart-marathon*.deb $HOME/repo/incoming/ubuntu/precise${PKG_TYPE}/
41
42		# CentOS6
43		cp sysvinit-marathon*.rpm $HOME/repo/incoming/el${PKG_TYPE}/6/
44
45		# CentOS 7
46		cp systemd-marathon*.rpm $HOME/repo/incoming/el${PKG_TYPE}/7/

Package Marathon using sbt-native-packager
ClosedAll Users
Actions

Details

Diff Detail

Revision Contents

Diff 2757

Dockerfile

Dockerfile.build

Dockerfile.development

Jenkinsfile

Jenkinsfile.phab.groovy

bin/build-base-image.sh

bin/build-distribution

bin/marathon-framework

bin/start

build.sbt

changelog.md

marathon.groovy

packaging/Makefile

packaging/README.md

packaging/marathon

packaging/marathon.conf

packaging/marathon.init

packaging/marathon.postinst

packaging/marathon.postrm

packaging/marathon.service

packaging/marathon.systemd.postinst

project/Dependencies.scala

project/plugins.sbt

scripts/publish_packages.sh

Package Marathon using sbt-native-packagerClosedAll UsersActions

Details

Diff Detail

Revision Contents

Diff 2757

Dockerfile

Dockerfile.build

Dockerfile.development

Jenkinsfile

Jenkinsfile.phab.groovy

bin/build-base-image.sh

bin/build-distribution

bin/marathon-framework

bin/start

build.sbt

changelog.md

marathon.groovy

packaging/Makefile

packaging/README.md

packaging/marathon

packaging/marathon.conf

packaging/marathon.init

packaging/marathon.postinst

packaging/marathon.postrm

packaging/marathon.service

packaging/marathon.systemd.postinst

project/Dependencies.scala

project/plugins.sbt

scripts/publish_packages.sh

Package Marathon using sbt-native-packager
ClosedAll Users
Actions