Revert "Added develocity CI configuration eclipse-ee4j#25322"

This reverts commit 65836cb.
pzygielo · Jan 20, 2025 · 5a555f5 · 5a555f5
1 parent df80159
commit 5a555f5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 42 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -26,6 +26,4 @@ jobs:
       # qa skips documentation - we check it on Jenkins CI
       # We skip checkstyle too - we check it on Jenkins CI
       run: ./apache-maven-3.9.9/bin/mvn -B -e clean install -Pstaging -Pqa '-Dcheckstyle.skip=true'
-      env:
-        DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
 
diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
@@ -8,22 +8,23 @@
   <projectId>glassfish</projectId>
   <buildScan>
     <obfuscation>
+      <username>#{'eclipse-' + env['EF_SHORT_NAME'] + '-bot'}</username>
       <ipAddresses>0.0.0.0</ipAddresses>
     </obfuscation>
     <publishing>
       <onlyIf>
         <![CDATA[authenticated]]>
       </onlyIf>
     </publishing>
-    <backgroundBuildScanUpload>#{isFalse(env['CI']) and isFalse(env['JENKINS_URL'])}</backgroundBuildScanUpload>
+    <backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload>
   </buildScan>
   <buildCache>
     <local>
       <enabled>false</enabled>
     </local>
     <remote>
       <enabled>false</enabled>
-      <storeEnabled>#{isTrue(env['CI']) or isTrue(env['JENKINS_URL'])}</storeEnabled>
+      <storeEnabled>#{isTrue(env['CI'])}</storeEnabled>
     </remote>
   </buildCache>
 </develocity>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,12 +15,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-def secrets = [
-  [path: 'cbi/glassfish/develocity.eclipse.org', secretValues: [
-    [envVar: 'DEVELOCITY_ACCESS_KEY', vaultKey: 'api-token']
-    ]
-  ]
-]
 
 def dumpSysInfo() {
   sh """
@@ -72,14 +66,12 @@ def generateAntPodTemplate(job) {
           timeout(time: 1, unit: 'HOURS') {
             withAnt(installation: 'apache-ant-latest') {
               dumpSysInfo()
-              withVault([vaultSecrets: secrets]) {
-                  sh """
-                    mkdir -p ${WORKSPACE}/appserver/tests
-                    tar -xzf ${WORKSPACE}/bundles/appserv_tests.tar.gz -C ${WORKSPACE}/appserver/tests
-                    export CLASSPATH=${WORKSPACE}/glassfish7/javadb
-                    ${WORKSPACE}/appserver/tests/gftest.sh run_test ${job}
-                  """
-              }
+              sh """
+                mkdir -p ${WORKSPACE}/appserver/tests
+                tar -xzf ${WORKSPACE}/bundles/appserv_tests.tar.gz -C ${WORKSPACE}/appserver/tests
+                export CLASSPATH=${WORKSPACE}/glassfish7/javadb
+                ${WORKSPACE}/appserver/tests/gftest.sh run_test ${job}
+              """
             }
           }
         } finally {
@@ -194,20 +186,18 @@ spec:
         checkout scm
         container('maven') {
           dumpSysInfo()
-          withVault([vaultSecrets: secrets]) {
-              sh '''
-                # Validate the structure in all submodules (especially version ids)
-                mvn -B -e -fae clean validate -Ptck,set-version-id,staging
-                # Until we fix ANTLR in cmp-support-sqlstore, broken in parallel builds. Just -Pfast after the fix.
-                mvn -B -e install -Pfastest,staging -T4C
-                ./gfbuild.sh archive_bundles
-                ./gfbuild.sh archive_embedded
-                mvn -B -e clean -Pstaging
-                tar -c -C ${WORKSPACE}/appserver/tests common_test.sh gftest.sh appserv-tests quicklook | gzip --fast > ${WORKSPACE}/bundles/appserv_tests.tar.gz
-                ls -la ${WORKSPACE}/bundles
-                ls -la ${WORKSPACE}/embedded
-              '''
-          }
+          sh '''
+            # Validate the structure in all submodules (especially version ids)
+            mvn -B -e -fae clean validate -Ptck,set-version-id,staging
+            # Until we fix ANTLR in cmp-support-sqlstore, broken in parallel builds. Just -Pfast after the fix.
+            mvn -B -e install -Pfastest,staging -T4C
+            ./gfbuild.sh archive_bundles
+            ./gfbuild.sh archive_embedded
+            mvn -B -e clean -Pstaging
+            tar -c -C ${WORKSPACE}/appserver/tests common_test.sh gftest.sh appserv-tests quicklook | gzip --fast > ${WORKSPACE}/bundles/appserv_tests.tar.gz
+            ls -la ${WORKSPACE}/bundles
+            ls -la ${WORKSPACE}/embedded
+          '''
         }
         archiveArtifacts artifacts: 'bundles/*.zip', onlyIfSuccessful: true
         archiveArtifacts artifacts: 'embedded/*', onlyIfSuccessful: true
@@ -220,11 +210,9 @@ spec:
         container('maven') {
           dumpSysInfo()
           timeout(time: 1, unit: 'HOURS') {
-            withVault([vaultSecrets: secrets]) {
-                sh '''
-                    mvn -B -e clean install -Pstaging,qa
-                '''
-            }
+            sh '''
+                mvn -B -e clean install -Pstaging,qa
+            '''
           }
         }
       }
@@ -257,11 +245,9 @@ spec:
         container('maven') {
           dumpSysInfo()
           timeout(time: 1, unit: 'HOURS') {
-            withVault([vaultSecrets: secrets]) {
-                sh '''
-                    mvn -B -e clean install -Pstaging -f docs -amd
-                '''
-            }
+            sh '''
+                mvn -B -e clean install -Pstaging -f docs -amd
+            '''
           }
         }
       }