Skip to content
Permalink
Browse files
[JENKINS-50933] - Update patch for JENKINS-51302, remork the manual f…
…low to Makefile
  • Loading branch information
oleg-nenashev committed May 14, 2018
1 parent 3fb2c44 commit adc0df4ff783938442890f2c65bc0105ce60da96
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 103 deletions.
@@ -0,0 +1,29 @@
# Just a Makefile for manual testing
.PHONY: all

ARTIFACT_ID = jenkins-remoting-it
VERSION = 2.107.3-remoting-it-SNAPSHOT
# https://github.com/jenkinsci/custom-war-packager/pull/28
CWP_VERSION = 0.1-alpha-6-20180514.155901-2

all: clean build

clean:
rm -rf tmp

build: tmp/output/target/jenkins-war-${VERSION}.war

tmp/output/target/jenkins-war-${VERSION}.war:
# TODO: https://github.com/jenkinsci/custom-war-packager/pull/26
mvn io.jenkins.tools.custom-war-packager:custom-war-packager-maven-plugin:${CWP_VERSION}:build -DconfigFile=essentials.yml -Dversion=${VERSION}

run: tmp/output/target/jenkins-war-${VERSION}.war
JENKINS_HOME=work java -jar tmp/output/target/${ARTIFACT_ID}-${VERSION}.war \
--httpPort=8080 --prefix=/jenkins

pct: tmp/output/target/jenkins-war-${VERSION}.war
docker run --rm -v maven-repo:/root/.m2 -v $(shell pwd)/out:/pct/out \
-v $(shell pwd)/tmp/output/target/${ARTIFACT_ID}-${VERSION}.war:/pct/jenkins.war:ro \
-e ARTIFACT_ID=ssh-slaves \
-e INSTALL_BUNDLED_SNAPSHOTS=true \
jenkins/pct
@@ -3,6 +3,8 @@ packaging:
# We cannot use BOM here, because BOM does not support build by relative path
configFile: "packager-config.yml"
archiveArtifacts: true
# https://github.com/jenkinsci/custom-war-packager/pull/28
cwpVersion: 0.1-alpha-6-20180514.155850-2
ath:
useLocalSnapshots: false
athImage: "local"

This file was deleted.

This file was deleted.

This file was deleted.

@@ -8,7 +8,7 @@ war:
groupId: "org.jenkins-ci.main"
artifactId: "jenkins-war"
source:
version: "2.107.2"
version: "2.107.3"
plugins:
- groupId: "org.jenkins-ci.plugins"
artifactId: "ssh-slaves"

0 comments on commit adc0df4

Please sign in to comment.