Skip to content

Commit

Permalink
HSEARCH-4478 Run tests against AWS OpenSearch service
Browse files Browse the repository at this point in the history
  • Loading branch information
yrodiere committed Feb 4, 2022
1 parent 0fd6e1f commit b82dd58
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion Jenkinsfile
Expand Up @@ -268,6 +268,8 @@ stage('Configure') {
condition: TestCondition.AFTER_MERGE)
],
esAws: [
// --------------------------------------------
// AWS Elasticsearch service (OpenDistro)
new EsAwsBuildEnvironment(version: '5.6', mavenProfile: 'elasticsearch-5.6',
condition: TestCondition.AFTER_MERGE),
new EsAwsBuildEnvironment(version: '6.0', mavenProfile: 'elasticsearch-6.0',
Expand Down Expand Up @@ -299,8 +301,13 @@ stage('Configure') {
new EsAwsBuildEnvironment(version: '7.10', mavenProfile: 'elasticsearch-7.10',
condition: TestCondition.AFTER_MERGE),

// --------------------------------------------
// AWS OpenSearch service
new OpenSearchEsAwsBuildEnvironment(version: '1.1', mavenProfile: 'opensearch-1.0',
condition: TestCondition.AFTER_MERGE),

// Also test static credentials, but only for the latest version
new EsAwsBuildEnvironment(version: '7.10', mavenProfile: 'elasticsearch-7.10',
new OpenSearchEsAwsBuildEnvironment(version: '1.1', mavenProfile: 'opensearch-1.0',
staticCredentials: true,
condition: TestCondition.AFTER_MERGE)
]
Expand Down Expand Up @@ -769,6 +776,15 @@ class EsAwsBuildEnvironment extends BuildEnvironment {
}
}

class OpenSearchEsAwsBuildEnvironment extends EsAwsBuildEnvironment {
@Override
String getTag() { "opensearch-aws-$version" + (staticCredentials ? "-credentials-static" : "") }
@Override
String getLockedResourcesLabel() {
"opensearch-aws-${nameEmbeddableVersion}"
}
}

void keepOnlyEnvironmentsMatchingFilter(String regex) {
def pattern = /$regex/

Expand Down

0 comments on commit b82dd58

Please sign in to comment.