Build scripts updated and refactored #225
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,15 +16,16 @@ | |
| import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage | ||
| import com.bmuschko.gradle.docker.tasks.image.DockerRemoveImage | ||
|
|
||
| val projectDir = rootProject.projectDir.absolutePath.replace("\\", "/"); | ||
| val dockerImageRef = "$buildDir/.docker/buildImage-imageId.txt" | ||
| val dockerContainerName = project.property("docker.app.container.name")?.toString() ?: "cogboard" | ||
| val dockerImageName = project.property("docker.app.image.name")?.toString() ?: "cogboard/cogboard-app" | ||
| val mountDir = "$projectDir/mnt" | ||
| val cypressContentPath = "$projectDir/cogboard-app/src/main/resources/cypressData/config.json" | ||
| val defaultCypressTestsDir = "$projectDir/functional/cypress-tests" | ||
| val functionalTestsPath = System.getProperty("functionalTestPath") ?: defaultCypressTestsDir | ||
| val cypressEnvCode = System.getProperty("cypressEnv") ?: "local" | ||
| val cypressConfigPath = "cypress/config/$cypressEnvCode.json" | ||
| val network = "${project.name}-local_cognet" | ||
| val wsPort = project.property("ws.port") | ||
| val appPort = project.property("app.port") | ||
|
|
@@ -33,106 +34,105 @@ logger.lifecycle(">> dockerContainerName: $dockerContainerName") | |
| logger.lifecycle(">> dockerImageName: $dockerImageName") | ||
| logger.lifecycle(">> mountDir: $mountDir") | ||
| logger.lifecycle(">> functionalTestsPath: $functionalTestsPath") | ||
| logger.lifecycle(">> cypressConfigPath: $cypressConfigPath") | ||
|
|
||
| tasks { | ||
|
There was a problem hiding this comment. task registration is now grouped in |
||
|
|
||
| register<DockerRemoveImage>("removeImage") { | ||
| group = "docker" | ||
|
|
||
| onlyIf { File(dockerImageRef).exists() } | ||
|
|
||
| targetImageId(if (File(dockerImageRef).exists()) File(dockerImageRef).readText() else "") | ||
| onError { | ||
| if (!this.message!!.contains("No such image")) | ||
| throw this | ||
| } | ||
| } | ||
|
|
||
| register<DockerBuildImage>("buildImage") { | ||
| group = "docker" | ||
|
|
||
| inputDir.set(file("$buildDir")) | ||
| images.add("$dockerImageName:$version") | ||
| dependsOn("prepareDocker", "build") | ||
| } | ||
|
|
||
| register<Exec>("updateLocal") { | ||
| group = "docker" | ||
| commandLine = listOf("docker", "service", "update", "--force", "${project.name}-local_cogboard") | ||
| } | ||
|
|
||
| register<Exec>("updateMocks") { | ||
| group = "docker" | ||
| commandLine = listOf("docker", "service", "update", "--force", "${project.name}-local_api-mocks") | ||
| } | ||
|
|
||
| register<Exec>("initSwarm") { | ||
| group = "swarm" | ||
| commandLine = listOf("docker", "swarm", "init") | ||
| isIgnoreExitValue = true | ||
| } | ||
|
|
||
| register<Exec>("awaitLocalStackUndeployed") { | ||
| commandLine = listOf("docker", "network", "inspect", network) | ||
| isIgnoreExitValue = true | ||
| errorOutput = java.io.ByteArrayOutputStream() | ||
| doLast { | ||
| if (errorOutput.toString().contains("Error: No such network")) { | ||
| //we are happy, since this network is down we can proceed | ||
| } else { | ||
| Thread.sleep(15 * 1000) // let's wait for better times | ||
| } | ||
| } | ||
| mustRunAfter("build") | ||
| } | ||
|
|
||
| register<Exec>("deployLocal") { | ||
| environment = mapOf("COGBOARD_VERSION" to version) | ||
| group = "swarm" | ||
| commandLine = listOf("docker", "stack", "deploy", "-c", "${project.name}-local-compose.yml", "${project.name}-local") | ||
| dependsOn("initSwarm", "buildImage", "awaitLocalStackUndeployed") | ||
| mustRunAfter("undeployLocal") | ||
| } | ||
|
|
||
| register<Exec>("undeployLocal") { | ||
| group = "swarm" | ||
| commandLine = listOf("docker", "stack", "rm", "${project.name}-local") | ||
| dependsOn("initSwarm") | ||
| } | ||
|
|
||
| register("redeployLocal") { | ||
| group = "swarm" | ||
| dependsOn("undeployLocal", "deployLocal") | ||
| } | ||
|
|
||
| register<Exec>("functionalTests") { | ||
| group = "Docker Functional Tests" | ||
| commandLine = listOf( | ||
| "docker", "run", | ||
| "-v", "$functionalTestsPath:/e2e", | ||
| "-w", "/e2e", | ||
| "--network=$network", | ||
| "cypress/included:3.8.0", | ||
| "--browser", "chrome", | ||
| "--config-file", cypressConfigPath | ||
| ) | ||
|
|
||
| dependsOn("redeployLocal", "copyCypressContent") | ||
| doFirst { | ||
| logger.lifecycle("Running functional tests from $functionalTestsPath with base network: $network") | ||
| } | ||
| } | ||
|
|
||
|
Comment on lines
-134
to
-137
There was a problem hiding this comment. @staszke - We have better approach for copying files - lets use the old way without unnecessary script that will not work when you don't have shell |
||
| register<Copy>("copyCypressContent") { | ||
| group = "Docker Functional Tests" | ||
|
|
||
| from(cypressContentPath) | ||
| into(mountDir) | ||
| doLast { | ||
| logger.lifecycle(">> Automated testing data has been successfully copied") | ||
| } | ||
| mustRunAfter("redeployLocal") | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lets group them together