Cleanup Jenkins scripts

STEllAR-GROUP · Sep 17, 2023 · aaa2423 · aaa2423
1 parent d939373
commit aaa2423
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 67 deletions.
diff --git a/.jenkins/lsu-perftests/Jenkinsfile b/.jenkins/lsu-perftests/Jenkinsfile
@@ -2,6 +2,7 @@
 
 // Copyright (c) 2020 ETH Zurich
 // Copyright (c) 2022 Hartmut Kaiser
+// Copyright (c) 2023 Panos Syskakis
 //
 // SPDX-License-Identifier: BSL-1.0
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -19,51 +20,27 @@ pipeline {
             )
         )
     }
-    environment {
-        GITHUB_TOKEN = credentials('STELLARBOT_GITHUB_TOKEN')
-    }
     stages {
-        stage('checkout') {
-            steps {
-                dir('hpx') {
-                    sh '''
-                    #!/bin/bash -l
-                    rm -rf *
-                    '''
-                    checkout scm
-                    echo "Running ${env.BUILD_ID} on ${env.JENKINS_URL}"
-                }
-            }
-        }
         stage('perftests') {
-            matrix {
-                axes {
-                    axis {
-                        name 'configuration_name'
-                        values 'perftests'
-                    }
-                }
-                stages {
-                    stage('perftests') {
-                        steps {
-                            dir('hpx') {
-                                sh '''
-                                #!/bin/bash -l
-                                .jenkins/lsu-perftests/entry.sh
-                                '''
-                            }
-                        }
-                    }
-                }
+            environment{
+                GITHUB_TOKEN = credentials('STELLARBOT_GITHUB_TOKEN')
+                configuration_name = "perftests"
+            }
+            steps {
+                echo "Running ${env.BUILD_ID} on ${env.JENKINS_URL}"
+                sh '''
+                #!/bin/bash -l
+                .jenkins/lsu-perftests/entry.sh
+                '''
             }
         }
     }
 
     post {
         always {
-            archiveArtifacts artifacts: 'hpx/jenkins-hpx-*', fingerprint: true
-            archiveArtifacts artifacts: 'hpx/*-Testing/**', fingerprint: true
-            archiveArtifacts artifacts: 'hpx/*-reports/**', fingerprint: true
+            archiveArtifacts artifacts: 'jenkins-hpx-*', fingerprint: true
+            archiveArtifacts artifacts: '*-Testing/**', fingerprint: true
+            archiveArtifacts artifacts: '*-reports/**', fingerprint: true
         }
     }
 }
diff --git a/.jenkins/lsu-perftests/launch_perftests.sh b/.jenkins/lsu-perftests/launch_perftests.sh
@@ -24,17 +24,6 @@ hpx_test_options=(
     --vector_size=518176 --hpx:threads=4 --iterations=200 \
     --warmup_iterations=20")
 
-
-    #     "--hpx:ini=hpx.thread_queue.init_threads_count=100 \
-    # --hpx:threads=4 --vector_size=10000 --work_delay=1 \
-    # --chunk_size=0 --test_count=5000"
-    # "--hpx:ini=hpx.thread_queue.init_threads_count=100 \
-    # --hpx:queuing=local-priority --hpx:threads=4 --test-all \
-    # --repetitions=100 --futures=500000"
-    # "--hpx:ini=hpx.thread_queue.init_threads_count=100 \
-    # --vector_size=1048576 --hpx:threads=4 --iterations=5000 \
-    # --warmup_iterations=500")
-
 # Build binaries for performance tests
 ${perftests_dir}/driver.py -v -l $logfile build -b release -o build \
     --source-dir ${src_dir} --build-dir ${build_dir} -e $envfile \

diff --git a/.jenkins/lsu-test-coverage/Jenkinsfile b/.jenkins/lsu-test-coverage/Jenkinsfile
@@ -25,29 +25,16 @@ pipeline {
 
     }
     stages {
-        stage('checkout') {
-            steps {
-                dir('hpx') {
-                    sh '''
-                    #!/bin/bash -l
-                    rm -rf *
-                    '''
-                    checkout scm
-                    echo "Running ${env.BUILD_ID} on ${env.JENKINS_URL}"
-                }
-            }
-        }
         stage('test-coverage') {
+            echo "Running ${env.BUILD_ID} on ${env.JENKINS_URL}"
             environment{
                 configuration_name = "test-coverage"
             }
             steps {
-                dir('hpx') {
-                    sh '''
-                    #!/bin/bash -l
-                    .jenkins/lsu-test-coverage/entry.sh
-                    '''
-                }
+                sh '''
+                #!/bin/bash -l
+                .jenkins/lsu-test-coverage/entry.sh
+                '''
             }
         }
     }

diff --git a/.jenkins/lsu-test-coverage/entry.sh b/.jenkins/lsu-test-coverage/entry.sh
@@ -12,7 +12,7 @@
 set -eux
 
 # Clean up old artifacts
-rm -f ./jenkins-hpx* ./grcov-log.txt
+# rm -f ./jenkins-hpx* ./grcov-log.txt
 
 source .jenkins/lsu-test-coverage/slurm-constraint-${configuration_name}.sh