Merge branch 'develop' into chore/upgrade-module-programming-llm

ls1intum · Jul 29, 2024 · 78667f9 · 78667f9
2 parents fe96867 + a9a2c8f
commit 78667f9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/.env.example b/.env.example
@@ -1,2 +1,2 @@
 ATHENA_ENV_DIR=~/Athena-env
-ATHENA_DOMAIN=athenetest1-03.ase.cit.tum.de
+ATHENA_DOMAIN=athena.tld
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
@@ -34,7 +34,7 @@ jobs:
     needs: [ get-labels ]
     runs-on: ubuntu-latest
     # Only run workflow if the added label is a deploy label
-    if: contains(needs.get-labels.outputs.labels, 'deploy:athena-test3')
+    if: contains(needs.get-labels.outputs.labels, 'deploy:athena-test1')
     steps:
       - name: Get latest successful build for branch
         id: check_build
@@ -58,7 +58,7 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           labels: |
-            deploy:athena-test3
+            deploy:athena-test1
 
       - name: Check if latest push had successful build
         if: fromJSON(steps.check_build.outputs.data).total_count == 0
@@ -112,17 +112,17 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           labels: |
-            deploy:athena-test3
+            deploy:athena-test1
 
-      - name: Check "lock:athena-test3" label
+      - name: Check "lock:athena-test1" label
         uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const opts = github.rest.issues.listForRepo.endpoint.merge({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              labels: ['lock:athena-test3']
+              labels: ['lock:athena-test1']
             })
             const issues = await github.paginate(opts)
             if (issues.length == 1 && (!context.issue || issues[0].number != context.issue.number)) {
@@ -140,13 +140,13 @@ jobs:
                   repo: context.repo.repo,
                   body: '### ❌ Unable to deploy to test server ❌\nAthena Testserver is already in use by multiple PRs. Check PRs with label "lock:pyris-test"!'
                 })
-              core.setFailed('Athena Testserver is already in use by multiple PRs. Check PRs with label "lock:athena-test3"!');
+              core.setFailed('Athena Testserver is already in use by multiple PRs. Check PRs with label "lock:athena-test1"!');
             } else if (context.issue && context.issue.number) {
               await github.rest.issues.addLabels({
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                labels: ['lock:athena-test3']
+                labels: ['lock:athena-test1']
               })
             }
 
@@ -157,8 +157,8 @@ jobs:
     with:
       docker-tag: ${{ needs.compute-tag.outputs.tag }}
       branch-name: ${{ github.event.pull_request.head.ref }}
-      environment-name: Athena Test Server 3
-      environment-url: https://athenetest1-03.ase.cit.tum.de/
+      environment-name: Athena Test Server 1
+      environment-url: https://athena-test1.ase.cit.tum.de/
     secrets: inherit
 
 
@@ -171,4 +171,4 @@ jobs:
       - name: Add error label
         uses: actions-ecosystem/action-add-labels@v1
         with:
-          labels: deployment-error
+          labels: deployment-error
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -36,10 +36,10 @@ jobs:
     env:
       DOCKER_TAG: ${{ inputs.docker-tag }}
       BRANCH_NAME: ${{ inputs.branch-name }}
-      DEPLOYMENT_USER: ${{ vars.DEPLOYMENT_USER || 'ge32yam' }} # TODO: remove default value and add environment variable
-      DEPLOYMENT_HOST: ${{ vars.DEPLOYMENT_HOST || 'athenetest1-03.ase.cit.tum.de' }} # TODO: remove default value and add environment variable
-      DEPLOYMENT_FOLDER: ${{ vars.DEPLOYMENT_FOLDER || '/srv/athena' }} # TODO: remove default value and add environment variable
-      DEPLOYMENT_HOST_PUBLIC_KEYS: ${{ vars.DEPLOYMENT_HOST_PUBLIC_KEYS || 'athenetest1-03.ase.cit.tum.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDjL4fx0eOUeGJBadxwfu2tg0xBt1/Stki3hgI1khH4GIepznd3Y+rihFq0canku+TlXAY81AKsSAIkEr0aCe/Q=' }} # TODO: remove default value and add environment variable
+      DEPLOYMENT_USER: ${{ vars.DEPLOYMENT_USER }}
+      DEPLOYMENT_HOST: ${{ vars.DEPLOYMENT_HOST }}
+      DEPLOYMENT_FOLDER: ${{ vars.DEPLOYMENT_FOLDER }}
+      DEPLOYMENT_HOST_PUBLIC_KEYS: ${{ vars.DEPLOYMENT_HOST_PUBLIC_KEYS }}
       GATEWAY_USER: "jump"
       GATEWAY_HOST: "gateway.artemis.in.tum.de:2010"
       GATEWAY_HOST_PUBLIC_KEY: "[gateway.artemis.in.tum.de]:2010 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtTLiKRILjKZ+Qg4ReWKsG7mLDXkzHfeY5nalSQUNQ4"
@@ -69,4 +69,4 @@ jobs:
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
-          ./athena-server-cli docker-deploy "$DEPLOYMENT_USER@$DEPLOYMENT_HOST" -g "$GATEWAY_USER@$GATEWAY_HOST" -t $DOCKER_TAG -b $BRANCH_NAME -d $DEPLOYMENT_FOLDER -y
+          ./athena-server-cli docker-deploy "$DEPLOYMENT_USER@$DEPLOYMENT_HOST" -g "$GATEWAY_USER@$GATEWAY_HOST" -t $DOCKER_TAG -b $BRANCH_NAME -d $DEPLOYMENT_FOLDER -y
diff --git a/assessment_module_manager/deployments.docker.ini b/assessment_module_manager/deployments.docker.ini
@@ -2,7 +2,7 @@
 url = https://ma-schwind.ase.cit.tum.de
 
 [playground]
-url = https://athenetest1-03.ase.cit.tum.de
+url = https://athena-test1.ase.cit.tum.de/
 
 [localhost]
 url = http://localhost:3000
diff --git a/docs/user_guide/setup/setup.rst b/docs/user_guide/setup/setup.rst
@@ -13,7 +13,7 @@ There are multiple ways of accessing Athena through the Athena Playground:
   - You can upload, download, and remove your own evaluation data under a directory name.
   - Keep in mind that the **team can technically access the data on the test-server**. If encrypted/secured evaluation data is needed, you must request it.
   - Request the Athena Playground secret from the team or find it on the team's Confluence.
-  - **Playground access:** https://athenetest1-03.ase.cit.tum.de/playground
+  - **Playground access:** https://athena-test1.ase.cit.tum.de/playground
 
 2. **Local setup:**
   - **Pro:** We cannot access your data this way.
@@ -28,7 +28,7 @@ Connect to Athena Instance through the Playground
 --------------------------
 
 1. Open the playground
-  - Test-server setup: https://athenetest1-03.ase.cit.tum.de/playground
+  - Test-server setup: https://athena-test1.ase.cit.tum.de/playground
   - Local setup: http://localhost:3000
 2. Up top you see the **Base Info Header** containing all configuration
   .. figure:: ./base_info_header.png