diff --git a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile index 06523e8bfa..3c3680a8ed 100644 --- a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile +++ b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile @@ -240,26 +240,27 @@ pipeline { unstash "validate-artifacts-$BUILD_NUMBER" - if (VERSION) { + retry(2) { + if (VERSION) { + validateArtifacts( + version: "$VERSION", + distribution: "${local_distribution}", + arch: "${local_architecture}", + platform: "${local_platform}", + os_build_number: "$OS_BUILD_NUMBER", + osd_build_number: "$OSD_BUILD_NUMBER", + projects: "$PROJECTS", + artifact_type: "$ARTIFACT_TYPE", + allow_http: params.ALLOW_HTTP + ) + } + else { - validateArtifacts( - version: "$VERSION", - distribution: "${local_distribution}", - arch: "${local_architecture}", - platform: "${local_platform}", - os_build_number: "$OS_BUILD_NUMBER", - osd_build_number: "$OSD_BUILD_NUMBER", - projects: "$PROJECTS", - artifact_type: "$ARTIFACT_TYPE", - allow_http: params.ALLOW_HTTP - ) - } - else { - - validateArtifacts( - file_path: "$FILEPATH", - allow_http: params.ALLOW_HTTP - ) + validateArtifacts( + file_path: "$FILEPATH", + allow_http: params.ALLOW_HTTP + ) + } } } } catch (e) { diff --git a/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt index 1039b27527..016ffae063 100644 --- a/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt @@ -32,45 +32,50 @@ validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=tar, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution tar --platform linux --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=tar, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution tar --platform linux --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for tar-x64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=rpm, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution rpm --platform linux --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=rpm, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution rpm --platform linux --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for rpm-x64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=yum, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution yum --platform linux --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=yum, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution yum --platform linux --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for yum-x64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=deb, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution deb --platform linux --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=deb, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution deb --platform linux --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for deb-x64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=zip, arch=x64, platform=windows, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution zip --platform windows --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=zip, arch=x64, platform=windows, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution zip --platform windows --arch x64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for zip-x64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) @@ -94,36 +99,40 @@ validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=tar, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution tar --platform linux --arch arm64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=tar, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution tar --platform linux --arch arm64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for tar-arm64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=rpm, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution rpm --platform linux --arch arm64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=rpm, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution rpm --platform linux --arch arm64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for rpm-arm64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=yum, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution yum --platform linux --arch arm64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=yum, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution yum --platform linux --arch arm64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for yum-arm64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) validate-artifacts.timeout({time=1, unit=HOURS}, groovy.lang.Closure) validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host, groovy.lang.Closure) validate-artifacts.unstash(validate-artifacts-123) - validate-artifacts.validateArtifacts({version=2.3.0, distribution=deb, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) - validateArtifacts.fileExists(/tmp/workspace/validation.sh) - validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution deb --platform linux --arch arm64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) + validate-artifacts.retry(2, groovy.lang.Closure) + validate-artifacts.validateArtifacts({version=2.3.0, distribution=deb, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false}) + validateArtifacts.fileExists(/tmp/workspace/validation.sh) + validateArtifacts.sh(./validation.sh --version 2.3.0 --distribution deb --platform linux --arch arm64 --projects opensearch opensearch-dashboards --os-build-number 6039 --osd-build-number 4104 --artifact-type production) validate-artifacts.echo(Completed validation for deb-arm64) validate-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})