From da18601f35c97eee2285b046984f8247b257842d Mon Sep 17 00:00:00 2001
From: Alexandra Belousov <sashabelousovrh@Alexandras-MBP.lan>
Date: Mon, 6 Jan 2025 14:26:54 +0200
Subject: [PATCH] fix not cluster nightly release tests

---
 .../workflows/nightly_release_testing.yaml    | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nightly_release_testing.yaml b/.github/workflows/nightly_release_testing.yaml
index 6cb6bd7fb..2758cd2aa 100644
--- a/.github/workflows/nightly_release_testing.yaml
+++ b/.github/workflows/nightly_release_testing.yaml
@@ -7,7 +7,7 @@ on:
     - cron: '0 2 * * *'
 
 jobs:
-  not-cluster-tests:
+  not-cluster-not-server-tests:
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -35,7 +35,38 @@ jobs:
           KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
           ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
-        run: pytest --level release tests -k "not clustertest and not ondemand and not multinode"
+        run: pytest --level release tests -k "not clustertest and not ondemand and not multinode and not servertest"
+        timeout-minutes: 60
+
+  server-tests:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Setup Release Testing
+        uses: ./.github/workflows/setup_release_testing
+        with:
+          AWS_OSS_ROLE_ARN: ${{ secrets.AWS_OSS_ROLE_ARN }}
+          DEV_AWS_ACCESS_KEY: ${{ secrets.DEV_AWS_ACCESS_KEY }}
+          DEV_AWS_SECRET_KEY: ${{ secrets.DEV_AWS_SECRET_KEY }}
+          KUBECONFIG: ${{ secrets.KUBECONFIG }}
+          GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
+          GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
+          DEN_TESTER_TOKEN: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
+          DEN_TESTER_USERNAME: ${{ secrets.DEN_TESTER_USERNAME }}
+          API_SERVER_URL: ${{ env.API_SERVER_URL }}
+
+      - name: Run server tests
+        env:
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
+          ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
+        run: pytest --level release tests -k "not clustertest and not ondemand and not multinode and servertest"
         timeout-minutes: 60
 
   cluster-tests:
@@ -240,7 +271,8 @@ jobs:
   check-cluster-status:
     if: always()
     needs:
-      - not-cluster-tests
+      - not-cluster-not-server-tests
+      - server-tests
       - cluster-tests
       - ondemand-aws-tests-local-launcher
       - ondemand-aws-tests-den-launcher