Skip to content

Commit

Permalink
Revert "Remove BWC test for now as BWC framework does not run correct…
Browse files Browse the repository at this point in the history 
…ly as well as rpm integTest as it requires root (opensearch-project#1990)"

This reverts commit 43d52fa.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
  • Loading branch information
@peterzhuamazon
peterzhuamazon committed Apr 20, 2022
1 parent 26e1840 commit 81820bb
Show file tree
Hide file tree
Showing 2 changed files with 346 additions and 77 deletions.
212 changes: 173 additions & 39 deletions jenkins/opensearch-dashboards/distribution-build.jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,27 +88,50 @@ pipeline {
echo "buildManifestUrl (x64, tar): ${buildManifestUrl}"
echo "artifactUrl (x64, tar): ${artifactUrl}"

'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)
]
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_TAR_INTEG_TEST_RESULT = createTestResultsMessage(
testType: "Integ Tests (x64, tar)",
status: integTestResults.getResult(),
absoluteUrl: integTestResults.getAbsoluteUrl()
)
}
}
env.ARTIFACT_URL_X64_TAR_INTEG_TEST_RESULT = createTestResultsMessage(
testType: "Integ Tests (x64, tar)",
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_TAR_BWC_TEST_RESULT = createTestResultsMessage(
testType: "BWC Tests (x64, tar)",
status: bwcTestResults.getResult(),
absoluteUrl: bwcTestResults.getAbsoluteUrl()
)
}
}
])
}
}
post {
Expand Down Expand Up @@ -150,6 +173,50 @@ pipeline {
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 {
Expand Down Expand Up @@ -219,27 +286,50 @@ pipeline {
echo "buildManifestUrl (arm64, tar): ${buildManifestUrl}"
echo "artifactUrl (arm64, tar): ${artifactUrl}"

'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)
]
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_TAR_INTEG_TEST_RESULT = createTestResultsMessage(
testType: "Integ Tests (arm64, tar)",
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_TAR_INTEG_TEST_RESULT = createTestResultsMessage(
testType: "Integ Tests (arm64, tar)",
status: integTestResults.getResult(),
absoluteUrl: integTestResults.getAbsoluteUrl()
)
env.ARTIFACT_URL_ARM64_TAR_BWC_TEST_RESULT = createTestResultsMessage(
testType: "BWC Tests (arm64, tar)",
status: bwcTestResults.getResult(),
absoluteUrl: bwcTestResults.getAbsoluteUrl()
)
}
}
}
])
}
}
post {
Expand Down Expand Up @@ -311,6 +401,50 @@ pipeline {
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 {
Expand Down
Loading

0 comments on commit 81820bb

Please sign in to comment.