From 0f177b8792cc4274fba6d1ffa863c2f7dd58f387 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 1 Dec 2024 13:12:50 +0100 Subject: [PATCH] [Build] Remove duplicating Ubuntu smoke-tests Running smoke-tests on Ubuntu is not necessary anymore since I-build tests are already executed on Ubuntu now. See https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/2522 --- JenkinsJobs/SmokeTests/StartSmokeTests.groovy | 15 --- .../SmokeTests/smoke_test_ubuntu.groovy | 104 ------------------ 2 files changed, 119 deletions(-) delete mode 100644 JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy diff --git a/JenkinsJobs/SmokeTests/StartSmokeTests.groovy b/JenkinsJobs/SmokeTests/StartSmokeTests.groovy index 15ebca399d1..c0b0d78d2a2 100644 --- a/JenkinsJobs/SmokeTests/StartSmokeTests.groovy +++ b/JenkinsJobs/SmokeTests/StartSmokeTests.groovy @@ -9,11 +9,6 @@ pipeline { stages { stage('Trigger tests'){ parallel { - stage('Ubuntu 24.04 Java17'){ - steps { - build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17x64}")] - } - } stage('Opensuse Leap Java17'){ steps { build job: 'SmokeTests/ep-smoke-test-opensuse-leap', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17x64}")] @@ -34,11 +29,6 @@ pipeline { build job: 'SmokeTests/ep-smoke-test-ppcle', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java17ppcle}")] } } - stage('Ubuntu 24.04 Java21'){ - steps { - build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21x64}")] - } - } stage('Opensuse Leap Java21'){ steps { build job: 'SmokeTests/ep-smoke-test-opensuse-leap', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21x64}")] @@ -54,11 +44,6 @@ pipeline { build job: 'SmokeTests/ep-smoke-test-arm64', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java21arm64}")] } } - stage('Ubuntu 24.04 Java23'){ - steps { - build job: 'SmokeTests/ep-smoke-test-ubuntu', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java23x64}")] - } - } stage('Opensuse Leap Java23'){ steps { build job: 'SmokeTests/ep-smoke-test-opensuse-leap', parameters: [string(name: 'buildId', value: "${params.buildId}"), string(name: 'javaDownload', value: "${params.java23x64}")] diff --git a/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy b/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy deleted file mode 100644 index 6c6ce478331..00000000000 --- a/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy +++ /dev/null @@ -1,104 +0,0 @@ -pipelineJob('SmokeTests/ep-smoke-test-ubuntu'){ - - logRotator { - numToKeep(5) - } - - parameters { - stringParam('buildId', null, 'Build Id to test (such as I20120717-0800, N20120716-0800). ') - stringParam('javaDownload', 'https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/36/GPL/openjdk-19_linux-x64_bin.tar.gz', 'fully qualified link to java download') - stringParam('testsToRun', 'ui', 'This can be any ant target from https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/configuration/sdk.tests/testScripts/test.xml') - stringParam('secManager', '-Djava.security.manager=allow', null) - } - - definition { - cps { - sandbox() - script(''' -pipeline { - options { - timeout(time: 60, unit: 'MINUTES') - timestamps() - buildDiscarder(logRotator(numToKeepStr:'5')) - } - agent { - label "ubuntu-latest" - } - - stages { - stage('Run tests'){ - steps { - wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { - withEnv(["JAVA_HOME_NEW=${ tool 'openjdk-jdk19-latest' }"]) { - withAnt(installation: 'apache-ant-latest') { - sh \'\'\'#!/bin/bash -x - - buildId=$(echo $buildId|tr -d ' ') - RAW_DATE_START="$(date +%s )" - - cat /etc/*release - echo -e "\\n\\tRAW Date Start: ${RAW_DATE_START} \\n" - echo -e "\\n\\t whoami: $( whoami )\\n" - echo -e "\\n\\t uname -a: $(uname -a)\\n" - - # 0002 is often the default for shell users, but it is not when ran from - # a cron job, so we set it explicitly, to be sure of value, so releng group has write access to anything - # we create on shared area. - oldumask=$(umask) - umask 0002 - - echo "umask explicitly set to 0002, old value was $oldumask" - - # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it. - mkdir -p ${WORKSPACE}/tmp - - wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose --no-check-certificate https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1 - wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource - cat ${WORKSPACE}/buildproperties.shsource - source ${WORKSPACE}/buildproperties.shsource - - set -x - mkdir -p ${WORKSPACE}/java - pushd ${WORKSPACE}/java - wget -O jdk.tar.gz --no-verbose --no-check-certificate ${javaDownload} - tar xzf jdk.tar.gz - rm jdk.tar.gz - export JAVA_HOME_NEW=$(pwd)/$(ls) - popd - set +x - - export PATH=${JAVA_HOME_NEW}/bin:${ANT_HOME}/bin:${PATH} - - echo JAVA_HOME: $JAVA_HOME - export JAVA_HOME=$JAVA_HOME_NEW - echo ANT_HOME: $ANT_HOME - echo PATH: $PATH - export ANT_OPTS="${ANT_OPTS} -Djava.io.tmpdir=${WORKSPACE}/tmp ${secMananger}" - - env 1>envVars.txt 2>&1 - ant -diagnostics 1>antDiagnostics.txt 2>&1 - java -XshowSettings -version 1>javaSettings.txt 2>&1 - - ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=${testsToRun} - - RAW_DATE_END="$(date +%s )" - - echo -e "\\n\\tRAW Date End: ${RAW_DATE_END} \\n" - - TOTAL_TIME=$((${RAW_DATE_END} - ${RAW_DATE_START})) - - echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n" - \'\'\' - } - } - } - archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt' - junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml' - } - } - } -} - ''') - } - } -}