Skip to content

Commit 0f115ec

Browse files
committed
JsmDevDeployment.groovy
* Builder now supports configuring and using JSM snapshots
1 parent 9690768 commit 0f115ec

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.eficode</groupId>
88
<artifactId>devstack</artifactId>
9-
<version>2.3.23</version>
9+
<version>2.3.24-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>DevStack</name>
@@ -23,7 +23,7 @@
2323
<spock-core.version>2.3-groovy-${groovy.major.version}</spock-core.version>
2424
<jiraShortcuts.version>2.0.3-SNAPSHOT-groovy-3.0</jiraShortcuts.version>
2525
<bitbucketinstancemanager.version>0.0.3-SNAPSHOT-groovy-3.0</bitbucketinstancemanager.version>
26-
<jirainstancemanager.version>2.1.9</jirainstancemanager.version>
26+
<jirainstancemanager.version>2.1.10-SNAPSHOT</jirainstancemanager.version>
2727
</properties>
2828

2929

src/main/groovy/com/eficode/devstack/deployment/impl/JsmDevDeployment.groovy

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class JsmDevDeployment implements Deployment {
2727
Volume allureReportVolume
2828
DirectorySyncer reportSyncer
2929

30+
private Builder builder
31+
3032
DockerClientDS dockerClient
3133

3234
//Used when naming various Docker components
@@ -127,8 +129,7 @@ class JsmDevDeployment implements Deployment {
127129
allureContainer.created ?: allureContainer.createContainer()
128130
allureContainer.startContainer()
129131

130-
131-
jsmDeployment.setupDeployment(true, true)
132+
jsmDeployment.setupDeployment(builder.useSnapshotIfAvailable, builder.snapshotAfterCreation)
132133
//Change owner of the mounted volume
133134
jsmContainer.runBashCommandInContainer("chown -R jira:jira /var/atlassian/application-data/jira/allure-results", 10, "root")
134135

@@ -145,6 +146,8 @@ class JsmDevDeployment implements Deployment {
145146
private String jsmVersion = "latest"
146147
private String jsmJvmDebugPort = "5005"
147148
private Boolean enableJsmDooD = false
149+
private Boolean useSnapshotIfAvailable = false
150+
private Boolean snapshotAfterCreation = false
148151

149152
private Map<String, String> appsToInstall = [:]
150153

@@ -194,6 +197,16 @@ class JsmDevDeployment implements Deployment {
194197
return this
195198
}
196199

200+
Builder useSnapshotIfAvailable( ) {
201+
this.useSnapshotIfAvailable = true
202+
return this
203+
}
204+
205+
Builder snapshotAfterCreation( ) {
206+
this.snapshotAfterCreation = true
207+
return this
208+
}
209+
197210

198211
JsmDevDeployment build() {
199212

@@ -207,7 +220,7 @@ class JsmDevDeployment implements Deployment {
207220
devDeployment.jsmDeployment.jsmContainer.prepareBindMount("/var/run/docker.sock", "/var/run/docker.sock", false)
208221
}
209222
devDeployment.jsmDeployment.appsToInstall = this.appsToInstall
210-
223+
devDeployment.builder = this
211224

212225
return devDeployment
213226

0 commit comments

Comments
 (0)