-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DOCKER-442 fix solr backup numberToLive
* DOCKER-442 fix solr backup numberToLive * DOCKER-442 add time to live integration test
- Loading branch information
1 parent
151713e
commit df7937b
Showing
17 changed files
with
341 additions
and
194 deletions.
There are no files selected for viewing
File renamed without changes.
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
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 |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| junitJupiterVersion=5.4.2 | ||
| mockitoVersion=2.27.0 | ||
| solrVersion=6.6.5 | ||
| assVersion=2.0.8.2 | ||
| amazonVersion=1.12.32 | ||
| jaxBVersion=2.3.2 | ||
| restAssuredVersion=4.0.0 | ||
| awaitablityVersion=4.2.0 |
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,74 +1,60 @@ | ||
| plugins { | ||
| id 'java' | ||
| id 'idea' | ||
| apply plugin: 'java' | ||
| apply plugin: 'idea' | ||
| apply plugin: 'eu.xenit.docker' | ||
| apply plugin: 'eu.xenit.docker-compose.auto' | ||
|
|
||
| ext { | ||
| solrVersion = '6.6.5' | ||
| assVersion = '2.0.6' | ||
| solrBaseImage = 'docker.io/xenit/alfresco-solr6-xenit:2.0.6' | ||
| alfrescoimage = 'docker.io/xenit/alfresco-repository-community:7.3.0' | ||
| flavor = 'solr6' | ||
| } | ||
|
|
||
| dependencies { | ||
| testImplementation group: 'io.rest-assured', name: 'rest-assured', version: '3.0.1' | ||
| testImplementation group: 'io.rest-assured', name: 'json-path', version: '3.0.1' | ||
| testImplementation group: 'io.rest-assured', name: 'rest-assured-common', version: '3.0.1' | ||
| testImplementation "org.junit.jupiter:junit-jupiter-engine:5.4.2" | ||
| testImplementation "org.junit.jupiter:junit-jupiter-params:5.4.2" | ||
|
|
||
| testRuntimeOnly group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.2' | ||
| } | ||
| description = "Solr ${flavor} with backup" | ||
|
|
||
| test { | ||
| enabled = false | ||
| useJUnitPlatform() | ||
| testLogging { | ||
| events "passed", "skipped", "failed" | ||
| } | ||
| configurations { | ||
| backupJar | ||
| } | ||
|
|
||
| subprojects { | ||
| apply plugin: 'java' | ||
| apply plugin: 'eu.xenit.docker' | ||
| apply plugin: 'eu.xenit.docker-compose.auto' | ||
| apply from: "${project.projectDir}/overload.gradle" | ||
|
|
||
| description = "Solr ${flavor} with backup" | ||
|
|
||
| configurations { | ||
| amazonSdkCore | ||
| amazonSdkS3 | ||
| backupJar | ||
| } | ||
|
|
||
| dependencies { | ||
| amazonSdkCore group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.12.32', ext: 'jar' | ||
| amazonSdkS3 group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.32', ext: 'jar' | ||
| dependencies { | ||
| backupJar project(path: ":solr-backup") | ||
|
|
||
| backupJar project(path: ":solr-backup") | ||
| } | ||
| testImplementation "io.rest-assured:rest-assured:${restAssuredVersion}" | ||
| testImplementation "io.rest-assured:json-path:${restAssuredVersion}" | ||
| testImplementation "io.rest-assured:rest-assured-common:${restAssuredVersion}" | ||
| testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}" | ||
| testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}" | ||
| testImplementation "org.awaitility:awaitility:${awaitablityVersion}" | ||
|
|
||
| testImplementation platform("com.amazonaws:aws-java-sdk-bom:${amazonVersion}") | ||
|
|
||
| task integrationTest(type: Test, group: "verification") { | ||
| useJUnitPlatform() | ||
| testClassesDirs = project.parent.sourceSets.test.output.classesDirs | ||
| classpath = project.parent.sourceSets.test.runtimeClasspath | ||
| outputs.upToDateWhen { false } | ||
| } | ||
| testImplementation('com.amazonaws:aws-java-sdk-core') | ||
| testImplementation('com.amazonaws:aws-java-sdk-s3') | ||
| testImplementation("com.amazonaws:aws-java-sdk-sts") | ||
|
|
||
| testRuntimeOnly "org.glassfish.jaxb:jaxb-runtime:${jaxBVersion}" | ||
| } | ||
| test { | ||
| useJUnitPlatform() | ||
| } | ||
|
|
||
| createDockerFile { | ||
| from "${solrBaseImage}" | ||
| createDockerFile { | ||
| from "${solrBaseImage}" | ||
|
|
||
| dependsOn(configurations.backupJar) | ||
| dependsOn(configurations.backupJar) | ||
|
|
||
| if (flavor == "solr6") { | ||
| smartCopy "${project.parent.projectDir}/src/test/resources/solr.xml", "/opt/alfresco-search-services/solrhome/solr.xml" | ||
| smartCopy configurations.backupJar, "/opt/alfresco-search-services/solrhome/lib/" | ||
| smartCopy configurations.amazonSdkCore.singleFile, "/opt/alfresco-search-services/solrhome/lib/" | ||
| smartCopy configurations.amazonSdkS3.singleFile, "/opt/alfresco-search-services/solrhome/lib/" | ||
| } | ||
| if (flavor == "solr6") { | ||
| smartCopy "${project.projectDir}/src/test/resources/solr.xml", "/opt/alfresco-search-services/solrhome/solr.xml" | ||
| smartCopy configurations.backupJar, "/opt/alfresco-search-services/solrhome/lib/" | ||
| } | ||
| } | ||
|
|
||
| dockerCompose { | ||
| environment.put 'ALFRESCO_IMAGE', project.alfrescoimage | ||
| useComposeFiles = [ | ||
| "${project.parent.projectDir}/src/test/resources/compose/docker-compose.yml" | ||
| ] | ||
| isRequiredBy(project.tasks.integrationTest) | ||
| } | ||
| dockerCompose { | ||
| environment.put 'ALFRESCO_IMAGE', project.alfrescoimage | ||
| useComposeFiles = [ | ||
| "${project.projectDir}/src/test/resources/compose/docker-compose.yml" | ||
| ] | ||
| isRequiredBy(project.tasks.test) | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.