.gitlab-ci.yml

@@ -92,8 +92,8 @@ client_windows:
   - export REVISION="$(curl http://git.patrikdufresne.com/pdsl/maven-scm-version/raw/master/version.sh | bash -)"
   - echo "REVISION=$REVISION"
   # Start a virtual frame buffer
-  - (Xvfb :99 &)
-  - export DISPLAY=:99
+  - export DISPLAY=":$CI_JOB_ID"
+  - Xvfb $DISPLAY &
   # Run unit test only, since the build is not working on windows
   - mvn -B -Drevision=${REVISION} clean verify
   
@@ -118,7 +118,7 @@ server_test_deb:
   stage: test-package
   image: debian:stretch
   script: 
-  - bash ./minarca-server/tests/install-deb.sh ./minarca-server_*.deb
+  - bash ./tests/install-server-deb.sh ./minarca-server_*.deb
 
 client_test_deb:
   stage: test-package
@@ -126,7 +126,7 @@ client_test_deb:
   before_script: []
   script:
   - export MINARCA_DEB_FILE=$(ls -1 ./minarca-client/minarca-installation-package-deb/target/*.deb)
-  - bash ./minarca-client/tests/test_install_deb.sh
+  - bash ./tests/install-client-deb.sh
   
 client_test_exe:
   stage: test-package
@@ -134,7 +134,7 @@ client_test_exe:
   before_script: []
   script:
   - export MINARCA_EXE_FILE=$(ls -1 ./minarca-client/minarca-installation-package/target/*.exe)
-  - bash ./minarca-client/tests/test_install_exe.sh
+  - bash ./tests/install-client-win.sh
 
 server_publish:
   stage: publish
@@ -201,7 +201,7 @@ client_promote:
   - ssh -o StrictHostKeyChecking=no www-data@kalo.patrikdufresne.com ln -fs $(basename $MINARCA_EXE_FILE) /var/www/patrikdufresne/archive/minarca/minarca-latest-install.exe
   - ssh -o StrictHostKeyChecking=no www-data@kalo.patrikdufresne.com ln -fs $(basename $MINARCA_DEB_FILE) /var/www/patrikdufresne/archive/minarca/minarca-client_latest_all.deb
 
-deploy:staging:sestican:
+deploy_staging_sestican:
   stage: deploy
   image: ikus060/ansible
   variables:
@@ -225,7 +225,7 @@ deploy:staging:sestican:
   - cd ansible-config
   - ansible-playbook minarca.yml -i pdsl --extra-vars "ansible_user=root minarca_server_version=$MINARCA_VERSION" --limit sestican
   
-deploy:prod:ranculos:
+deploy_prod_ranculos:
   stage: deploy
   image: ikus060/ansible
   when: manual
@@ -250,12 +250,34 @@ deploy:prod:ranculos:
   - cd ansible-config
   - ansible-playbook minarca.yml -i pdsl --extra-vars "ansible_user=root minarca_server_version=$MINARCA_VERSION" --limit ranculos,mercor
   
-test:staging:sestican:
+test_link_debian_stretch:
   image: debian:stretch
   stage: test-integration
   variables:
     MINARCA_REPOSITORYNAME: test-${CI_JOB_ID}
   script: 
   - export MINARCA_DEB_FILE=$(ls -1 ./minarca-client/minarca-installation-package-deb/target/*.deb)
-  - bash ./minarca-server/tests/test-link.sh
+  - bash ./tests/install-client-deb.sh
+  - bash ./tests/link-link-deb-linux.sh
+  
+test_link_debian_buster:
+  image: debian:buster
+  stage: test-integration
+  variables:
+    MINARCA_REPOSITORYNAME: test-${CI_JOB_ID}
+  script: 
+  - export MINARCA_DEB_FILE=$(ls -1 ./minarca-client/minarca-installation-package-deb/target/*.deb)
+  - bash ./tests/install-client-deb.sh
+  - bash ./tests/link-link-deb-linux.sh
+  
+test_link_win:
+  image: debian:buster
+  stage: test-integration
+  variables:
+    MINARCA_REPOSITORYNAME: test-${CI_JOB_ID}
+  script: 
+  - export MINARCA_EXE_FILE=$(ls -1 ./minarca-client/minarca-installation-package/target/*.exe)
+  - bash ./tests/install-client-win.sh
+  - bash ./tests/link-link-win.sh
+  
   
\ No newline at end of file

minarca-client/minarca-installation-package/src/main/nsis/include/JREDyna_Inetc.nsh

@@ -119,13 +119,13 @@ downloadJRE:
   DetailPrint "Download result = $0"
 
   strcmp $0 "OK" downloadsuccessful
-  MessageBox MB_OK "There was a problem downloading required component - Error: $0"
+  MessageBox MB_OK "There was a problem downloading required component - Error: $0" /SD IDOK
   abort
   
 downloadsuccessful:
 
   DetailPrint $(JRE_LAUNCH_SETUP)
-  ExecWait '"$TEMP\jre_setup.exe" /s REBOOT=Disable AUTO_UPDATE=0 /L \"$TEMP\jre_setup.log\"' $0
+  ExecWait '"$TEMP\jre_setup.exe" /s REBOOT=Disable AUTO_UPDATE=0 WEB_JAVA=0 WEB_ANALYTICS=0 /L \"$TEMP\jre_setup.log\"' $0
   goto jreSetupfinished
   
 jreSetupFinished:
@@ -161,7 +161,7 @@ JREPathStorage:
 ExitInstallJRE:
 
   Pop $1
-  MessageBox MB_OK "Unable to install Java - Setup will be aborted$\n$\n$1"
+  MessageBox MB_OK "Unable to install Java - Setup will be aborted$\n$\n$1" /SD IDOK
   Pop $1    ; Restore $1
   Pop $0    ; Restore $0
   Abort

minarca-server/data/etc/minarca/minarca-server.conf

@@ -37,7 +37,7 @@ DefaultTheme=orange
 #EmailNotificationTime=23:00 
 
 # The SMTP server name (Required).
-#EmailHost=smtp.server.com
+#EmailHost=smtp.server.com:25
 
 # Encryption to be use if Any. Option: ssl or starttls (Default: none).
 #EmailEncryption=none

minarca-client/tests/test_install_exe.sh → tests/install-client-win.sh

@@ -7,6 +7,13 @@
 set -e
 set -x
 
+# Download the client
+MINARCA_EXE_FILE=${MINARCA_EXE_FILE:-./minarca-latest-install.exe}
+if [ ! -e "$MINARCA_EXE_FILE" ]; then
+    apt update && apt install -y wget
+    wget -O $MINARCA_EXE_FILE http://www.patrikdufresne.com/archive/minarca/${MINARCA_EXE_FILE##*/}
+fi
+
 # Install wine
 dpkg --add-architecture i386
 apt update
@@ -17,9 +24,16 @@ chmod +x /usr/local/bin/winetricks
 export WINEARCH=win32
 export WINEDEBUG=fixme-all
 
+wineboot
+
 # Install minarca exe in wine
-Xvfb :1 -screen 0 1280x960x24 &
-DISPLAY=:1 wine ./$MINARCA_EXE_FILE /S
+export DISPLAY=":${CI_JOB_ID:-99}"
+Xvfb $DISPLAY &
+wine ./$MINARCA_EXE_FILE /S
+
+# Add wine shortcut
+echo 'wine "C:\\users\\root\\Local Settings\\Application Data\\minarca\\bin\\minarca.exe" "$@"' > /usr/bin/minarca
+chmod +x /usr/bin/minarca
 
 # Show version
-wine "C:\users\root\Local Settings\Application Data\minarca\bin\minarca.exe" --version
+minarca --version

tests/link-link-win.sh

+#!/bin/bash
+# Integration test to verify if the server accept link from minarca-client.
+#
+# Copyright (C) 2019 Patrik Dufresne Service Logiciel inc. All rights reserved.
+# Patrik Dufresne Service Logiciel PROPRIETARY/CONFIDENTIAL.
+# Use is subject to license terms.
+set -e
+set -x
+
+# Default variables
+MINARCA_REMOTE_URL=${MINARCA_REMOTE_URL:-https://test.minarca.net}
+MINARCA_USERNAME=${MINARCA_USERNAME:-admin}
+MINARCA_PASSWORD=${MINARCA_PASSWORD:-admin123}
+MINARCA_REPOSITORYNAME=${MINARCA_REPOSITORYNAME:-test}
+
+# Link minarca
+minarca link --remoteurl $MINARCA_REMOTE_URL --username $MINARCA_USERNAME --password $MINARCA_PASSWORD --name $MINARCA_REPOSITORYNAME