From 6415f831c7248e3bff4e82d19a9b27a20bafb081 Mon Sep 17 00:00:00 2001 From: Prudhvi Godithi Date: Fri, 13 Sep 2024 16:11:15 -0700 Subject: [PATCH] Test publish new fields Signed-off-by: Prudhvi Godithi --- .../integ-test.jenkinsfile | 4 +- .../opensearch/distribution-build.jenkinsfile | 4 +- jenkins/opensearch/integ-test.jenkinsfile | 8 ++-- sample-report | 42 +++++++++++++++++++ 4 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 sample-report diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index 7851396c7d..87a15749d2 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -7,9 +7,9 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@6.8.4', retriever: modernSCM([ +lib = library(identifier: 'jenkins@main', retriever: modernSCM([ $class: 'GitSCMSource', - remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', + remote: 'https://github.com/prudhvigodithi/opensearch-build-libraries.git', ])) def docker_images = [ diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile index f66f7f714d..d00676a688 100644 --- a/jenkins/opensearch/distribution-build.jenkinsfile +++ b/jenkins/opensearch/distribution-build.jenkinsfile @@ -7,9 +7,9 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@6.7.2', retriever: modernSCM([ +lib = library(identifier: 'jenkins@main', retriever: modernSCM([ $class: 'GitSCMSource', - remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', + remote: 'https://github.com/prudhvigodithi/opensearch-build-libraries.git', ])) pipeline { diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index 7eb21c256d..685f6c5935 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -7,9 +7,9 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@6.8.4', retriever: modernSCM([ +lib = library(identifier: 'jenkins@main', retriever: modernSCM([ $class: 'GitSCMSource', - remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', + remote: 'https://github.com/prudhvigodithi/opensearch-build-libraries.git', ])) def docker_images = [ @@ -327,10 +327,12 @@ pipeline { } retry(5) { node(agent_nodes['linux_x64']) { + checkout scm sleep 10 def rc = (params.RC_NUMBER.toInteger() > 0) sh "mkdir -p test-results-os-${env.BUILD_NUMBER}" - sh "curl -sSL https://ci.opensearch.org/ci/dbc/integ-test/${env.version}/${env.buildId}/${env.platform}/${env.architecture}/${env.distribution}/test-results/${env.BUILD_NUMBER}/integ-test/test-report.yml --output test-results-os-${env.BUILD_NUMBER}/test-report.yml" + sh "mv sample-report test-results-os-${env.BUILD_NUMBER}/test-report.yml" + // sh "curl -sSL https://ci.opensearch.org/ci/dbc/integ-test/${env.version}/${env.buildId}/${env.platform}/${env.architecture}/${env.distribution}/test-results/${env.BUILD_NUMBER}/integ-test/test-report.yml --output test-results-os-${env.BUILD_NUMBER}/test-report.yml" publishIntegTestResults( distributionBuildUrl: "https://build.ci.opensearch.org/blue/organizations/jenkins/${env.BUILD_JOB_NAME}/detail/${env.BUILD_JOB_NAME}/${env.buildId}/pipeline", jobName: env.JOB_NAME, diff --git a/sample-report b/sample-report new file mode 100644 index 0000000000..41bab30dac --- /dev/null +++ b/sample-report @@ -0,0 +1,42 @@ +--- +schema-version: '1.1' +name: OpenSearch +version: 2.17.0 +platform: linux +architecture: arm64 +distribution: tar +id: '10292' +rc: '6' +test-run: + Command: ./test.sh integ-test manifests/2.17.0/opensearch-2.17.0-test.yml --paths + opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.17.0/10292/linux/arm64/tar + TestType: integ-test + TestManifest: manifests/2.17.0/opensearch-2.17.0-test.yml + DistributionManifest: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.17.0/10292/linux/arm64/tar/dist/opensearch/manifest.yml + TestID: '8688' +components: + - name: skills + repository: https://github.com/opensearch-project/skills.git + command: ./test.sh integ-test manifests/2.17.0/opensearch-2.17.0-test.yml --paths + opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.17.0/10292/linux/arm64/tar + --component skills + configs: + - name: with-security + status: PASS + yml: https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/skills.yml + test_stdout: https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/stdout.txt + test_stderr: https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/stderr.txt + cluster_stdout: + - https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/local-cluster-logs/id-0/stdout.txt + cluster_stderr: + - https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/with-security/local-cluster-logs/id-0/stderr.txt + - name: without-security + status: PASS + yml: https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/skills.yml + test_stdout: https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/stdout.txt + test_stderr: https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/stderr.txt + cluster_stdout: + - https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/local-cluster-logs/id-1/stdout.txt + cluster_stderr: + - https://ci.opensearch.org/ci/dbc/integ-test/2.17.0/10292/linux/arm64/tar/test-results/8688/integ-test/skills/without-security/local-cluster-logs/id-1/stderr.txt +