Update to Ubuntu 22.04 (#8)

Update Github Action images to Ubuntu 22.04
hyrise · May 22, 2024 · 6b8e1b4 · 6b8e1b4
1 parent 8fe10fb
commit 6b8e1b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/haupt.yml b/.github/workflows/haupt.yml
@@ -19,7 +19,7 @@ env:
 jobs:
   hyrise_full_pipeline:
     name: Hyrise - Full calibration and evaluation pipeline
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     outputs:
       core_count: ${{ steps.core_client_counts.outputs.core_count }}
@@ -41,7 +41,7 @@ jobs:
       run: |
            sudo apt-get update -y -qq
            # We don't use Hyrise's install_dependencies script as it includes much more than needed for this small setup here.
-           sudo apt-get install -y -qq ninja-build libboost-all-dev postgresql-server-dev-all libtbb-dev systemtap-sdt-dev lld numactl
+           sudo apt-get install -y -qq ninja-build libboost-all-dev postgresql-server-dev-14 libtbb-dev systemtap-sdt-dev lld numactl
            pip3 install -r python/requirements.txt --quiet
 
     - name: Determine core and client counts for database comparison
@@ -144,7 +144,7 @@ jobs:
 
   database_comparison:
     name: Database Comparison
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     outputs:
       core_count: ${{ steps.core_client_counts.outputs.core_count }}
@@ -199,8 +199,8 @@ jobs:
     - name: Install dependencies
       run: |
            sudo apt-get update -y -qq
-           sudo apt-get install -y -qq ninja-build postgresql-server-dev-all numactl bison # gcc-10 g++-10 cpp-10
-           pip3 install -r python/requirements.txt
+           sudo apt-get install -y -qq ninja-build postgresql-server-dev-14 numactl bison
+           pip3 install -r python/requirements.txt --quiet
 
     - name: Setup MonetDB
       if: env.SKIP_MONETDB == 'false'
@@ -262,7 +262,7 @@ jobs:
   plotting:
     needs: [hyrise_full_pipeline, database_comparison]
     name: Plotting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@master

diff --git a/python/db_comparison_runner.py b/python/db_comparison_runner.py
@@ -298,7 +298,7 @@ def loop(thread_id, queries, query_id, start_time, successful_runs, timeout, is_
     if time_left < 0:
       break
     print('\rBenchmarking {}... {:.0f} seconds left'.format(query_name, time_left), end="")
-    time.sleep(1)
+    time.sleep(min(10, time_left))
 
   while True:
     joined_threads = 0