Skip to content
Permalink
Browse files
[JENKINS-51656] - Just small refactorings
  • Loading branch information
oleg-nenashev committed Jun 4, 2018
1 parent 75ea545 commit bf072e69d58bb0a345090a186571ac8430d48037
Showing with 4 additions and 5 deletions.
  1. +3 −3 custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/impl/JenkinsWarPatcher.java
  2. +1 −2 demo/casc/Makefile
@@ -189,13 +189,13 @@ private void excludeLib(DependencyInfo lib) throws IOException, InterruptedExcep
}

public JenkinsWarPatcher addResources(@Nonnull Map<String, File> resources) throws IOException {
for (Map.Entry<String, File> hookSrc : resources.entrySet()) {
final String resourceId = hookSrc.getKey();
for (Map.Entry<String, File> resourceSrc : resources.entrySet()) {
final String resourceId = resourceSrc.getKey();
WARResourceInfo resource = config.findResourceById(resourceId);
if (resource == null) {
throw new IOException("Cannot find metadata for the resource with ID=" + resourceId);
}
addResource(resource, hookSrc.getValue());
addResource(resource, resourceSrc.getValue());
}

return this;
@@ -18,7 +18,6 @@ tmp/output/target/${ARTIFACT_ID}-${VERSION}.war:

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

@@ -28,7 +27,7 @@ pct: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
-v $(shell pwd)/pct_out:/pct/out \
-v $(shell pwd)/pct_tmp:/pct/tmp \
-v $(shell pwd)/tmp/output/target/${ARTIFACT_ID}-${VERSION}.war:/pct/jenkins.war:ro \
-e ARTIFACT_ID=artifact-manager-s3 \
-e ARTIFACT_ID=role-strategy \
-e INSTALL_BUNDLED_SNAPSHOTS=true \
jenkins/pct \
-mavenProperties jenkins-test-harness.version=2.38:jth.jenkins-war.path=/pct/jenkins.war

0 comments on commit bf072e6

Please sign in to comment.