Skip to content

Commit

Permalink
Revert opensearch-project#1990 and remove rpm integ/bwc test, and dis…
Browse files Browse the repository at this point in the history 
…able tar bwc test for 2.0.0

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
  • Loading branch information
@peterzhuamazon
peterzhuamazon committed Apr 20, 2022
1 parent 81820bb commit 242ee93
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 272 deletions.
116 changes: 0 additions & 116 deletions jenkins/opensearch-dashboards/distribution-build.jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,69 +166,11 @@ pipeline {
architecture: 'x64',
distribution: 'rpm'
)
String buildManifestUrl = buildManifestObj.getUrl(JOB_NAME, BUILD_NUMBER)
String artifactUrl = buildManifestObj.getArtifactUrl(JOB_NAME, BUILD_NUMBER)
env.ARTIFACT_URL_X64_RPM = artifactUrl

echo "buildManifestUrl (x64, rpm): ${buildManifestUrl}"
echo "artifactUrl (x64, rpm): ${artifactUrl}"

parallel([
'integ-test': {
Boolean skipIntegTests = INTEG_TEST_JOB_NAME == ''
echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}"
if (!skipIntegTests) {
def integTestResults =
build job: INTEG_TEST_JOB_NAME,
propagate: false,
wait: true,
parameters: [
string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
string(name: 'AGENT_LABEL', value: AGENT_X64)
]

env.ARTIFACT_URL_X64_RPM_INTEG_TEST_RESULT = createTestResultsMessage(
testType: "Integ Tests (x64, rpm)",
status: integTestResults.getResult(),
absoluteUrl: integTestResults.getAbsoluteUrl()
)
}
},
'bwc-test': {
Boolean skipBwcTests = BWC_TEST_JOB_NAME == ''
echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}"
if (!skipBwcTests) {
def bwcTestResults =
build job: BWC_TEST_JOB_NAME,
propagate: false,
wait: true,
parameters: [
string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
string(name: 'AGENT_LABEL', value: AGENT_X64)
]

env.ARTIFACT_URL_X64_RPM_BWC_TEST_RESULT = createTestResultsMessage(
testType: "BWC Tests (x64, rpm)",
status: bwcTestResults.getResult(),
absoluteUrl: bwcTestResults.getAbsoluteUrl()
)
}
}
])
}
}
post {
always {
script {
lib.jenkins.Messages.new(this).add(
"${STAGE_NAME}",
lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]) +
"\n${env.ARTIFACT_URL_X64_RPM_INTEG_TEST_RESULT}" +
"\n${env.ARTIFACT_URL_X64_RPM_BWC_TEST_RESULT}"
)

postCleanup()
}
}
Expand Down Expand Up @@ -394,69 +336,11 @@ pipeline {
architecture: 'arm64',
distribution: 'rpm'
)

String buildManifestUrl = buildManifestObj.getUrl(JOB_NAME, BUILD_NUMBER)
String artifactUrl = buildManifestObj.getArtifactUrl(JOB_NAME, BUILD_NUMBER)
env.ARTIFACT_URL_ARM64_RPM = artifactUrl
echo "buildManifestUrl (arm64, rpm): ${buildManifestUrl}"
echo "artifactUrl (arm64, rpm): ${artifactUrl}"

parallel([
'integ-test': {
Boolean skipIntegTests = INTEG_TEST_JOB_NAME == ''
echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}"
if (!skipIntegTests) {
def integTestResults =
build job: INTEG_TEST_JOB_NAME,
propagate: false,
wait: true,
parameters: [
string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
string(name: 'AGENT_LABEL', value: AGENT_ARM64)
]

env.ARTIFACT_URL_ARM64_RPM_INTEG_TEST_RESULT = createTestResultsMessage(
testType: "Integ Tests (arm64, rpm)",
status: integTestResults.getResult(),
absoluteUrl: integTestResults.getAbsoluteUrl()
)
}
},
'bwc-test': {
Boolean skipBwcTests = BWC_TEST_JOB_NAME == ''
echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}"
if (!skipBwcTests) {
def bwcTestResults =
build job: BWC_TEST_JOB_NAME,
propagate: false,
wait: true,
parameters: [
string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
string(name: 'AGENT_LABEL', value: AGENT_ARM64)
]

env.ARTIFACT_URL_ARM64_RPM_BWC_TEST_RESULT = createTestResultsMessage(
testType: "BWC Tests (arm64, rpm)",
status: bwcTestResults.getResult(),
absoluteUrl: bwcTestResults.getAbsoluteUrl()
)
}
}
])
}
}
post {
always {
script {
lib.jenkins.Messages.new(this).add(
"${STAGE_NAME}",
lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]) +
"\n${env.ARTIFACT_URL_ARM64_RPM_INTEG_TEST_RESULT}" +
"\n${env.ARTIFACT_URL_ARM64_RPM_BWC_TEST_RESULT}"
)

postCleanup()
}
}
Expand Down
118 changes: 0 additions & 118 deletions jenkins/opensearch/distribution-build.jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,69 +230,11 @@ pipeline {
inputManifest: "manifests/${INPUT_MANIFEST}",
distribution: "rpm"
)
String buildManifestUrl = buildManifestObj.getUrl(JOB_NAME, BUILD_NUMBER)
String artifactUrl = buildManifestObj.getArtifactUrl(JOB_NAME, BUILD_NUMBER)
env.ARTIFACT_URL_X64_RPM = artifactUrl

echo "buildManifestUrl (x64, rpm): ${buildManifestUrl}"
echo "artifactUrl (x64, rpm): ${artifactUrl}"

parallel([
'integ-test': {
Boolean skipIntegTests = INTEG_TEST_JOB_NAME == ''
echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}"
if (!skipIntegTests) {
def integTestResults =
build job: INTEG_TEST_JOB_NAME,
propagate: false,
wait: true,
parameters: [
string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
string(name: 'AGENT_LABEL', value: AGENT_X64)
]

env.ARTIFACT_URL_X64_RPM_INTEG_TEST_RESULT = createTestResultsMessage(
testType: "Integ Tests (x64, rpm)",
status: integTestResults.getResult(),
absoluteUrl: integTestResults.getAbsoluteUrl()
)
}
},
'bwc-test': {
Boolean skipBwcTests = BWC_TEST_JOB_NAME == ''
echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}"
if (!skipBwcTests) {
def bwcTestResults =
build job: BWC_TEST_JOB_NAME,
propagate: false,
wait: true,
parameters: [
string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
string(name: 'AGENT_LABEL', value: AGENT_X64)
]

env.ARTIFACT_URL_X64_RPM_BWC_TEST_RESULT = createTestResultsMessage(
testType: "BWC Tests (x64, rpm)",
status: bwcTestResults.getResult(),
absoluteUrl: bwcTestResults.getAbsoluteUrl()
)
}
}
])
}
}
post {
always {
script {
lib.jenkins.Messages.new(this).add(
"${STAGE_NAME}",
lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]) +
"\n${env.ARTIFACT_URL_X64_RPM_INTEG_TEST_RESULT}" +
"\n${env.ARTIFACT_URL_X64_RPM_BWC_TEST_RESULT}"
)

postCleanup()
}
}
Expand Down Expand Up @@ -396,70 +338,10 @@ pipeline {
inputManifest: "manifests/${INPUT_MANIFEST}",
distribution: "rpm"
)
String buildManifestUrl = buildManifestObj.getUrl(JOB_NAME, BUILD_NUMBER)
String artifactUrl = buildManifestObj.getArtifactUrl(JOB_NAME, BUILD_NUMBER)
env.ARTIFACT_URL_ARM64_RPM = artifactUrl

echo "buildManifestUrl (arm64, rpm): ${buildManifestUrl}"
echo "artifactUrl (arm64, rpm): ${artifactUrl}"

parallel([
'integ-test': {
Boolean skipIntegTests = INTEG_TEST_JOB_NAME == ''
echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}"
if (!skipIntegTests) {
def integTestResults =
build job: INTEG_TEST_JOB_NAME,
propagate: false,
wait: true,
parameters: [
string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
string(name: 'AGENT_LABEL', value: AGENT_ARM64)
]

env.ARTIFACT_URL_ARM64_RPM_INTEG_TEST_RESULT = createTestResultsMessage(
testType: "Integ Tests (arm64, rpm)",
status: integTestResults.getResult(),
absoluteUrl: integTestResults.getAbsoluteUrl()
)
}
},
'bwc-test': {
Boolean skipBwcTests = BWC_TEST_JOB_NAME == ''
echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}"
if (!skipBwcTests) {
def bwcTestResults =
build job: BWC_TEST_JOB_NAME,
propagate: false,
wait: true,
parameters: [
string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
string(name: 'AGENT_LABEL', value: AGENT_ARM64)
]

env.ARTIFACT_URL_ARM64_RPM_BWC_TEST_RESULT = createTestResultsMessage(
testType: "BWC Tests (arm64, rpm)",
status: bwcTestResults.getResult(),
absoluteUrl: bwcTestResults.getAbsoluteUrl()
)

}
}
])
}
}
post {
always {
script {
lib.jenkins.Messages.new(this).add(
"${STAGE_NAME}",
lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]) +
"\n${env.ARTIFACT_URL_ARM64_RPM_INTEG_TEST_RESULT}" +
"\n${env.ARTIFACT_URL_ARM64_RPM_BWC_TEST_RESULT}"
)

postCleanup()
}
}
Expand Down
38 changes: 0 additions & 38 deletions manifests/2.0.0/opensearch-2.0.0-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ components:
- without-security
additional-cluster-configs:
path.repo: [/tmp]
bwc-test:
test-configs:
- with-security
- without-security

- name: anomaly-detection
integ-test:
Expand All @@ -27,20 +23,12 @@ components:
test-configs:
- with-security
- without-security
bwc-test:
test-configs:
- with-security
- without-security

- name: asynchronous-search
integ-test:
test-configs:
- with-security
- without-security
bwc-test:
test-configs:
- with-security
- without-security

- name: alerting
integ-test:
Expand All @@ -49,21 +37,13 @@ components:
- without-security
additional-cluster-configs:
plugins.destination.host.deny_list: [10.0.0.0/8, 127.0.0.1]
bwc-test:
test-configs:
- with-security
- without-security

- name: notifications
working-directory: notifications
integ-test:
test-configs:
- with-security
- without-security
bwc-test:
test-configs:
- with-security
- without-security

- name: sql
integ-test:
Expand All @@ -72,45 +52,27 @@ components:
- without-security
additional-cluster-configs:
script.context.field.max_compilations_rate: 1000/1m
bwc-test:
test-configs:
- with-security
- without-security

- name: k-NN
integ-test:
test-configs:
- with-security
- without-security
bwc-test:
test-configs:
- with-security
- without-security

- name: dashboards-reports
working-directory: reports-scheduler
integ-test:
test-configs:
- without-security
bwc-test:
test-configs:
- without-security

- name: observability
working-directory: opensearch-observability
integ-test:
test-configs:
- without-security
bwc-test:
test-configs:
- without-security

- name: ml-commons
integ-test:
test-configs:
- with-security
- without-security
bwc-test:
test-configs:
- with-security
- without-security

0 comments on commit 242ee93

Please sign in to comment.