Merge branch 'release/2.1.0'

Author: dlen

.gitlab-ci.yml

@@ -1,7 +1,16 @@
+default:
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+      - stuck_or_timeout_failure
+      - api_failure
+      - stale_schedule
+
 stages:
   - Quality
   - Test CE
   - Test PRO
   - Publish
 
-include: '.gitlab-ci/**.yml'
+include: ".gitlab-ci/**.yml"

.gitlab-ci/test.yml

@@ -135,26 +135,26 @@ openSUSE 15 PRO:
     ZYPPER_OPTIONS: "-n --no-gpg-checks"
   image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/opensuse-leap-15
 
-Fedora 34 CE:
+Fedora 36 CE:
   extends: .test-rpm-ce
-  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-34
-
-Fedora 34 PRO:
-  extends: .test-rpm-pro
-  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-34
+  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-36
 
-Fedora 35 CE:
+Fedora 37 CE:
   extends: .test-rpm-ce
-  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-35
-
-Fedora 35 PRO:
-  extends: .test-rpm-pro
-  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-35
+  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-37
 
-Fedora 36 CE:
+Fedora 38 CE:
   extends: .test-rpm-ce
-  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-36
+  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-38
 
 Fedora 36 PRO:
   extends: .test-rpm-pro
   image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-36
+
+Fedora 37 PRO:
+  extends: .test-rpm-pro
+  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-37
+
+Fedora 38 PRO:
+  extends: .test-rpm-pro
+  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/fedora-38

passbolt-repo-setup.ce.sh

@@ -66,9 +66,9 @@ function is_supported_distro() {
             "ol9"
             "almalinux8"
             "almalinux9"
-            "fedora34"
-            "fedora35"
             "fedora36"
+            "fedora37"
+            "fedora38"
             "opensuse-leap15"
           )
     for DISTRO in "${DISTROS[@]}"
@@ -105,7 +105,7 @@ compliance_check () {
       then
         _error_exit "${PHP_ERROR}"
       fi
-      if rpm -qa | grep remi-release > /dev/null 
+      if rpm -qa | grep remi-release > /dev/null
       then
         _error_exit "remi-release is already installed, please remove it before executing this script"
       fi
@@ -192,7 +192,7 @@ enabled=1
 autorefresh=0
 baseurl=http://download.opensuse.org/repositories/devel:/languages:/php/openSUSE_Leap_${OS_VERSION}/
 EOF
-    PHP_EXTENSION_REPO_VERSION="openSUSE_Leap_${OS_VERSION}"
+    PHP_EXTENSION_REPO_VERSION="${OS_VERSION}"
     if [ "${OS_VERSION}" = "15.4" ]
     then
       PHP_EXTENSION_REPO_VERSION="15.4"
@@ -317,13 +317,7 @@ EOF
 }
 
 install_passbolt () {
-  if [ "${PACKAGE_MANAGER}" = "apt" ]
-  then
     ${PACKAGE_MANAGER} install -y passbolt-${PASSBOLT_FLAVOUR}-server
-  elif [ "${PACKAGE_MANAGER}" = "yum" ] || [ "${PACKAGE_MANAGER}" = "dnf" ] || [ "${PACKAGE_MANAGER}" = "zypper" ]
-  then
-    ${PACKAGE_MANAGER} install -y passbolt-${PASSBOLT_FLAVOUR}-server
-  fi
 }
 
 setup_complete () {

passbolt-repo-setup.pro.sh

@@ -66,9 +66,9 @@ function is_supported_distro() {
             "ol9"
             "almalinux8"
             "almalinux9"
-            "fedora34"
-            "fedora35"
             "fedora36"
+            "fedora37"
+            "fedora38"
             "opensuse-leap15"
           )
     for DISTRO in "${DISTROS[@]}"
@@ -105,7 +105,7 @@ compliance_check () {
       then
         _error_exit "${PHP_ERROR}"
       fi
-      if rpm -qa | grep remi-release > /dev/null 
+      if rpm -qa | grep remi-release > /dev/null
       then
         _error_exit "remi-release is already installed, please remove it before executing this script"
       fi
@@ -192,7 +192,7 @@ enabled=1
 autorefresh=0
 baseurl=http://download.opensuse.org/repositories/devel:/languages:/php/openSUSE_Leap_${OS_VERSION}/
 EOF
-    PHP_EXTENSION_REPO_VERSION="openSUSE_Leap_${OS_VERSION}"
+    PHP_EXTENSION_REPO_VERSION="${OS_VERSION}"
     if [ "${OS_VERSION}" = "15.4" ]
     then
       PHP_EXTENSION_REPO_VERSION="15.4"