Merge branch 'e2e/feature/RI-5743-Rename-capabilities' of https://github.com/RedisInsight/RedisInsight into e2e/feature/RI-5743-Rename-capabilities

Author: KIvanow

.circleci/config.yml.backup

@@ -396,15 +396,36 @@ jobs:
       - attach_workspace:
           at: .
       - run: sudo apt-get install net-tools
+      - run: sudo apt-get install xdotool
+      - run: sudo apt-get install -y desktop-file-utils
+      - run:
+          name: Install Google Chrome
+          command: |
+            wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+            sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
+            sudo apt-get update
+            sudo apt-get install -y google-chrome-stable
+            sudo apt-get install -y \
+            libnss3 \
+            libgconf-2-4 \
+            libxss1 \
+            libasound2
+            xdg-settings set default-web-browser google-chrome.desktop
       - run:
           name: Install WM
           command: sudo apt install fluxbox
       - run:
-          name: Run X11
+          name: Install Xvfb
+          command: sudo apt-get install -y xvfb
+      - run:
+          name: Start Xvfb
           command: |
-            Xvfb :99 -screen 0 1920x1080x24 &
+            if [ -f /tmp/.X99-lock ]; then rm /tmp/.X99-lock; fi
+            Xvfb :99 -ac -screen 0 1920x1080x24 &
             sleep 3
             fluxbox &
+            export DISPLAY=:99
+            echo $DISPLAY
       # - run:
       #     name: Clone mocked RDI server
       #     command: |

.circleci/e2e/test.app-image.sh

@@ -3,20 +3,52 @@ set -e
 
 yarn --cwd tests/e2e install
 
-# mount app resources
-./release/*.AppImage --appimage-mount >> apppath &
+# Create the ri-test directory if it doesn't exist
+mkdir -p ri-test
+
+# Extract the AppImage
+chmod +x ./release/*.AppImage
+./release/*.AppImage --appimage-extract
+
+# Move contents of squashfs-root to ri-test and remove squashfs-root folder
+mv squashfs-root/* ri-test/
+rm -rf squashfs-root
+
+# Export custom XDG_DATA_DIRS with ri-test
+export XDG_DATA_DIRS="$(pwd)/ri-test:$XDG_DATA_DIRS"
 
 # create folder before tests run to prevent permissions issue
 mkdir -p tests/e2e/remote
 mkdir -p tests/e2e/rdi
 
-# run rte
+# Create a custom .desktop file for RedisInsight
+cat > ri-test/redisinsight.desktop <<EOL
+[Desktop Entry]
+Version=1.0
+Name=RedisInsight
+Exec=$(pwd)/ri-test/redisinsight %u
+Icon=$(pwd)/ri-test/resources/app.asar/img/icon.png
+Type=Application
+Terminal=false
+MimeType=x-scheme-handler/redisinsight;
+EOL
+
+# Copy the .desktop file to the local applications directory
+cp ri-test/redisinsight.desktop "$HOME/.local/share/applications"
+
+# Update the desktop database with custom directory
+update-desktop-database "$(pwd)/ri-test/"
+
+# Register the RedisInsight deeplink protocol
+xdg-mime default redisinsight.desktop x-scheme-handler/redisinsight
+
+# Run rte
 docker-compose -f tests/e2e/rte.docker-compose.yml build
 docker-compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
 ./tests/e2e/wait-for-redis.sh localhost 12000 && \
 
-# run tests
-COMMON_URL=$(tail -n 1 apppath)/resources/app.asar/dist/renderer/index.html \
-ELECTRON_PATH=$(tail -n 1 apppath)/redisinsight \
+# Run tests
+COMMON_URL=$(pwd)/ri-test/resources/app.asar/dist/renderer/index.html \
+ELECTRON_PATH=$(pwd)/ri-test/redisinsight \
 RI_SOCKETS_CORS=true \
 yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci

.github/e2e/test.app-image.sh

@@ -3,21 +3,52 @@ set -e
 
 yarn --cwd tests/e2e install
 
-# mount app resources
+# Create the ri-test directory if it doesn't exist
+mkdir -p ri-test
+
+# Extract the AppImage
 chmod +x ./release/*.AppImage
-./release/*.AppImage --appimage-mount >> apppath &
+./release/*.AppImage --appimage-extract
+
+# Move contents of squashfs-root to ri-test and remove squashfs-root folder
+mv squashfs-root/* ri-test/
+rm -rf squashfs-root
+
+# Export custom XDG_DATA_DIRS with ri-test
+export XDG_DATA_DIRS="$(pwd)/ri-test:$XDG_DATA_DIRS"
 
 # create folder before tests run to prevent permissions issue
 mkdir -p tests/e2e/remote
 mkdir -p tests/e2e/rdi
 
-# run rte
-docker compose -f tests/e2e/rte.docker-compose.yml build
-docker compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
+# Create a custom .desktop file for RedisInsight
+cat > ri-test/redisinsight.desktop <<EOL
+[Desktop Entry]
+Version=1.0
+Name=RedisInsight
+Exec=$(pwd)/ri-test/redisinsight %u
+Icon=$(pwd)/ri-test/resources/app.asar/img/icon.png
+Type=Application
+Terminal=false
+MimeType=x-scheme-handler/redisinsight;
+EOL
+
+# Copy the .desktop file to the local applications directory
+cp ri-test/redisinsight.desktop "$HOME/.local/share/applications"
+
+# Update the desktop database with custom directory
+update-desktop-database "$(pwd)/ri-test/"
+
+# Register the RedisInsight deeplink protocol
+xdg-mime default redisinsight.desktop x-scheme-handler/redisinsight
+
+# Run rte
+docker-compose -f tests/e2e/rte.docker-compose.yml build
+docker-compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
 ./tests/e2e/wait-for-redis.sh localhost 12000 && \
 
-# run tests
-COMMON_URL=$(tail -n 1 apppath)/resources/app.asar/dist/renderer/index.html \
-ELECTRON_PATH=$(tail -n 1 apppath)/redisinsight \
+# Run tests
+COMMON_URL=$(pwd)/ri-test/resources/app.asar/dist/renderer/index.html \
+ELECTRON_PATH=$(pwd)/ri-test/redisinsight \
 RI_SOCKETS_CORS=true \
 yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci

.github/workflows/manual-build.yml

@@ -106,6 +106,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - uses: actions/checkout@v4
     - name: Remove all artifacts
       uses: ./.github/actions/remove-artifacts
 

.github/workflows/release-prod.yml

@@ -13,6 +13,7 @@ jobs:
     with:
       group_tests: 'without_e2e'
       short_rte_list: false
+      pre_release: true
 
   builds-prod:
     name: Create all builds for release
@@ -63,5 +64,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - uses: actions/checkout@v4
     - name: Remove all artifacts
       uses: ./.github/actions/remove-artifacts

.github/workflows/release-stage.yml

@@ -13,6 +13,7 @@ jobs:
     with:
       group_tests: 'without_e2e'
       short_rte_list: false
+      pre_release: true
 
   builds:
     name: Release stage builds
@@ -49,5 +50,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - uses: actions/checkout@v4
     - name: Remove all artifacts
       uses: ./.github/actions/remove-artifacts  # Remove artifacts from github actions

.github/workflows/tests-e2e-appimage.yml

@@ -49,20 +49,29 @@ jobs:
       with:
         detached: true
 
-    - name: Install WM
+    - name: Install necessary packages
       run: |
         sudo apt-get update -y
-        sudo apt-get install kmod libfuse2 xvfb net-tools fluxbox netcat -y
+        sudo apt-get install kmod libfuse2 xvfb net-tools xdotool desktop-file-utils fluxbox netcat -y
+
+    - name: Install Google Chrome
+      run: |
+        wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+        sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
+        sudo apt-get update
+        sudo apt-get install -y google-chrome-stable libnss3 libgconf-2-4 libxss1 libasound2
+        xdg-settings set default-web-browser google-chrome.desktop
 
     - name: Download AppImage Artifacts
       uses: actions/download-artifact@v4
       with:
         name: linux-builds
         path: ./release
 
-    - name: Run X11
+    - name: Start Xvfb
       run: |
-        Xvfb :99 -screen 0 1920x1080x24 &
+        if [ -f /tmp/.X99-lock ]; then rm /tmp/.X99-lock; fi
+        Xvfb :99 -ac -screen 0 1920x1080x24 &
         sleep 3
         fluxbox &
 

.github/workflows/tests-e2e-docker.yml

@@ -132,6 +132,7 @@ jobs:
     if: always()
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v4
     - name: Deploy report
       uses: ./.github/actions/deploy-test-reports
       with:

.github/workflows/tests.yml

@@ -39,6 +39,10 @@ on:
         description: Use short rte list
         type: boolean
         default: true
+      pre_release:
+        description: Is pre-release
+        default: false
+        type: boolean
       debug:
         description: Enable SSH Debug
         default: false
@@ -141,15 +145,16 @@ jobs:
   clean:
     uses: ./.github/workflows/clean-deployments.yml
     needs: [frontend-tests, backend-tests, integration-tests, e2e-docker-tests, e2e-appimage-tests]
-    if: always()
+    if: ${{ !inputs.pre_release && always() }}
 
   # Remove artifacts from github actions
   remove-artifacts:
     name: Remove artifacts
     needs: [clean]
-    if: always()
+    if: ${{ !inputs.pre_release && always() }}
     runs-on: ubuntu-latest
 
     steps:
+    - uses: actions/checkout@v4
     - name: Remove all artifacts
       uses: ./.github/actions/remove-artifacts

tests/e2e/.gitignore

@@ -9,3 +9,4 @@ remote
 rihomedir
 rdi
 rte/rdi
+chrome_logs.txt