Merge branch 'master' of https://github.com/Arquisoft/wiq_es05c

Arquisoft · Apr 29, 2024 · 2c78cce · 2c78cce
2 parents 17aaa43 + 9e1a065
commit 2c78cce
Showing 1 changed file with 28 additions and 30 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,35 +31,14 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
-  e2e-tests:
-    needs: [unit-tests]
-    runs-on: self-hosted
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 20
-    - run: npm --prefix users/authservice install
-    - run: npm --prefix users/userservice install
-    - run: npm --prefix gatewayservice install
-    - run: npm --prefix historyservice install
-    - run: npm --prefix questionservice install
-    - run: npm --prefix roomservice install
-    - run: npm --prefix webapp install
-    - run: npm --prefix webapp run build
-    - run: npm --prefix webapp run test:e2e
-    env :
-      CI : ""
-
-
+
   docker-push-roomservice:
     name: Push room service Docker Image to GitHub Packages
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
+    needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -80,7 +59,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
+    needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -102,7 +81,7 @@ jobs:
             permissions:
               contents: read
               packages: write
-            needs: [e2e-tests]
+            needs: [unit-tests]
             steps:
               - uses: actions/checkout@v4
               - name: Publish to Registry
@@ -120,7 +99,7 @@ jobs:
             permissions:
               contents: read
               packages: write
-            needs: [e2e-tests]
+            needs: [unit-tests]
             steps:
               - uses: actions/checkout@v4
               - name: Publish to Registry
@@ -138,7 +117,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
+    needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -156,7 +135,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
+    needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -174,7 +153,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
+    needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -185,7 +164,26 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: gatewayservice
-
+  docker-push-grafana:
+    name: Push Grafana Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [e2e-tests]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es05c/grafana
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: grafana
+        buildargs: GF_SECURITY_ADMIN_PASSWORD
+      env:
+        GF_SECURITY_ADMIN_PASSWORD: ${{ secrets.GF_SECURITY_ADMIN_PASSWORD  }}
 
 
   deploy: