diff --git a/pom.xml b/pom.xml index afd768f..ae7367e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.eficode devstack - 2.3.0-SNAPSHOT + 2.3.1-SNAPSHOT jar DevStack diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy index 37e0749..bb1da0e 100644 --- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy +++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy @@ -104,7 +104,9 @@ class JsmH2Deployment implements Deployment{ assert jsmContainer.startContainer() : "Error starting JSM container:" + jsmContainer.id log.info("\tStarted JSM container") - + log.info("\tCreating jira-config.properties") + String cmdJiraConfigProperties = "echo \"jira.websudo.is.disabled=true\" >> jira-config.properties; chown jira:jira jira-config.properties && echo status: \$?" + assert jsmContainer.runBashCommandInContainer(cmdJiraConfigProperties).find {it == "status: 0"} : "Error creating jira-config.properties file" log.info("\tSetting up local H2 database") assert jiraRest.setupH2Database() : "Error setting up H2 database for JSM" diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy index b14c8ce..9014886 100644 --- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy +++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy @@ -49,6 +49,11 @@ class JsmH2DeploymentTest extends DevStackSpec { Unirest.get(baseurl).asEmpty().status == 200 jsmDep.jsmContainer.inspectContainer().networkSettings.ports.find { it.key == "$port/tcp" } + //Make sure websudo was disabled + jsmDep.jsmContainer.runBashCommandInContainer("cat jira-config.properties").find {it == "jira.websudo.is.disabled=true"} + jsmDep.jsmContainer.containerLogs.find {it.matches(".*jira.websudo.is.disabled.*:.*true.*")} + + where: baseurl | port | dockerHost | certPath