Unify I-, Y- and P-build configuration and fix minor discrepancies

eclipse-platform · Jan 17, 2024 · ea652da · ea652da
1 parent 9263e10
commit ea652da
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy
@@ -160,10 +160,7 @@ spec:
       stage('Clean Workspace'){
           steps {
               container('jnlp') {
-                sh \'\'\'
-                    cd $WORKSPACE
-                    rm -rf *
-                \'\'\'
+                cleanWs()
                 }
             }
 	    }
@@ -185,7 +182,7 @@ spec:
                 }
             }
 		}
-	  stage('Genrerate environment variables'){
+	  stage('Generate environment variables'){
           steps {
               container('jnlp') {
                 sh \'\'\'
@@ -274,7 +271,7 @@ spec:
               container('jnlp') {
                   sshagent(['git.eclipse.org-bot-ssh', 'github-bot-ssh']) {
                     sh \'\'\'
-                        git config --global user.email "releng-bot@eclipse.org"
+                        git config --global user.email "eclipse-releng-bot@eclipse.org"
                         git config --global user.name "Eclipse Releng Bot"
                         cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
                         ./mb100_cloneRepos.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb100_cloneRepos.sh.log
@@ -293,8 +290,6 @@ spec:
               container('jnlp') {
                   sshagent (['git.eclipse.org-bot-ssh', 'github-bot-ssh', 'projects-storage.eclipse.org-bot-ssh']) {
                     sh \'\'\'
-                        git config --global user.email "eclipse-releng-bot@eclipse.org"
-                        git config --global user.name "Eclipse Releng Bot"
                         cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
                         bash -x ./mb110_tagBuildInputs.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb110_tagBuildInputs.sh.log
                         if [[ ${PIPESTATUS[0]} -ne 0 ]]

diff --git a/JenkinsJobs/YBuilds/P_build.groovy b/JenkinsJobs/YBuilds/P_build.groovy
@@ -135,17 +135,14 @@ spec:
       stage('Clean Workspace'){
           steps {
               container('jnlp') {
-                sh \'\'\'
-                    cd $WORKSPACE
-                    rm -rf *
-                \'\'\'
+                cleanWs()
                 }
             }
 	    }
 	  stage('Setup intial configuration'){
           steps {
               container('jnlp') {
-                 sshagent(['github-bot-ssh']) {
+                  sshagent(['github-bot-ssh']) {
                       dir ('eclipse.platform.releng.aggregator') {
                         sh \'\'\'
                             git clone -b master git@github.com:eclipse-platform/eclipse.platform.releng.aggregator.git
@@ -160,7 +157,7 @@ spec:
                 }
             }
 		}
-	  stage('Genrerate environment variables'){
+	  stage('Generate environment variables'){
           steps {
               container('jnlp') {
                 sh \'\'\'
@@ -169,14 +166,14 @@ spec:
                     ./mb010_createEnvfiles.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb010_createEnvfiles.sh.log
                     if [[ ${PIPESTATUS[0]} -ne 0 ]]
                     then
-                        echo "Failed in Genrerate environment variables stage"
+                        echo "Failed in Generate environment variables stage"
                         exit 1
                     fi
                 \'\'\'
                 }
             }
 		}
-		stage('Load PGP keys'){
+	  stage('Load PGP keys'){
           environment {
                 KEYRING = credentials('secret-subkeys-releng.asc')
                 KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase')
@@ -210,7 +207,7 @@ spec:
               container('jnlp') {
                   sshagent(['git.eclipse.org-bot-ssh', 'github-bot-ssh']) {
                     sh \'\'\'
-                        git config --global user.email "releng-bot@eclipse.org"
+                        git config --global user.email "eclipse-releng-bot@eclipse.org"
                         git config --global user.name "Eclipse Releng Bot"
                         cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
                         ./mb100_cloneRepos.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb100_cloneRepos.sh.log
@@ -229,8 +226,6 @@ spec:
               container('jnlp') {
                   sshagent (['git.eclipse.org-bot-ssh', 'github-bot-ssh', 'projects-storage.eclipse.org-bot-ssh']) {
                     sh \'\'\'
-                        git config --global user.email "releng-bot@eclipse.org"
-                        git config --global user.name "Eclipse Releng Bot"
                         cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
                         bash -x ./mb110_tagBuildInputs.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb110_tagBuildInputs.sh.log
                         if [[ ${PIPESTATUS[0]} -ne 0 ]]

diff --git a/JenkinsJobs/YBuilds/Y_build.groovy b/JenkinsJobs/YBuilds/Y_build.groovy
@@ -155,10 +155,7 @@ spec:
       stage('Clean Workspace'){
           steps {
               container('jnlp') {
-                sh \'\'\'
-                    cd $WORKSPACE
-                    rm -rf *
-                \'\'\'
+                cleanWs()
                 }
             }
 	    }
@@ -180,7 +177,7 @@ spec:
                 }
             }
 		}
-	  stage('Genrerate environment variables'){
+	  stage('Generate environment variables'){
           steps {
               container('jnlp') {
                 sh \'\'\'
@@ -288,8 +285,6 @@ spec:
               container('jnlp') {
                   sshagent (['git.eclipse.org-bot-ssh', 'github-bot-ssh', 'projects-storage.eclipse.org-bot-ssh']) {
                     sh \'\'\'
-                        git config --global user.email "releng-bot@eclipse.org"
-                        git config --global user.name "Eclipse Releng Bot"
                         cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
                         bash -x ./mb110_tagBuildInputs.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb110_tagBuildInputs.sh.log
                         if [[ ${PIPESTATUS[0]} -ne 0 ]]