Skip to content

Disable websudo in JsmH2Deployment and added test case #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
farthinder merged 1 commit into from
May 15, 2023
Merged

Disable websudo in JsmH2Deployment and added test case #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.eficode</groupId>
<artifactId>devstack</artifactId>
<version>2.3.0-SNAPSHOT</version>
<version>2.3.1-SNAPSHOT</version>
<packaging>jar</packaging>

<name>DevStack</name>
Expand Down
4 changes: 3 additions & 1 deletion src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down