Merge branch 'master' into centos8

startxfr · Dec 20, 2021 · a66fbfb · a66fbfb
2 parents e856cf9 + c55af8f
commit a66fbfb
Show file tree

Hide file tree

Showing 15 changed files with 403 additions and 45 deletions.
diff --git a/.gitlab/ci/step-build-application.yaml b/.gitlab/ci/step-build-application.yaml
@@ -14,8 +14,8 @@ build-application-phpmyadmin:
     SXGLCI_TAG: ${SXGLCI_OTHERTAG}
   only:
     - master
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - centos8
     - centos7
     - centos6

diff --git a/.gitlab/ci/step-build-basic.yaml b/.gitlab/ci/step-build-basic.yaml
@@ -16,8 +16,8 @@ build-apache:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -53,8 +53,8 @@ build-nodejs:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -89,8 +89,8 @@ build-runner-bash:
     - master
     - centos8
     - centos7
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36

diff --git a/.gitlab/ci/step-build-os.yaml b/.gitlab/ci/step-build-os.yaml
@@ -23,8 +23,8 @@ build-os-latest:
     SXGLCI_TAG: latest
   only:
     - centos8
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
 

diff --git a/.gitlab/ci/step-build-runners.yaml b/.gitlab/ci/step-build-runners.yaml
@@ -16,8 +16,8 @@ build-runner-ansible:
     - master
     - centos8
     - centos7
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -46,8 +46,8 @@ build-runner-apache:
     - master
     - centos8
     - centos7
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -76,8 +76,8 @@ build-runner-nodejs:
     - master
     - centos8
     - centos7
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -106,8 +106,8 @@ build-runner-oc:
     - master
     - centos8
     - centos7
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -135,8 +135,8 @@ build-runner-php:
     - master
     - centos8
     - centos7
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36

diff --git a/.gitlab/ci/step-build-services.yaml b/.gitlab/ci/step-build-services.yaml
@@ -17,8 +17,8 @@ build-couchbase:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - ubi8
     - fc36
     - fc35
@@ -47,8 +47,8 @@ build-mariadb:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -82,8 +82,8 @@ build-memcache:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -119,8 +119,8 @@ build-mongo:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -156,8 +156,8 @@ build-ooconv:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - fc36
     - fc35
     - fc34
@@ -189,8 +189,8 @@ build-php:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36
@@ -225,8 +225,8 @@ build-postgres:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36

diff --git a/.gitlab/ci/step-build-vdi.yaml b/.gitlab/ci/step-build-vdi.yaml
@@ -16,8 +16,8 @@ build-vdi-chrome:
     - master
     - centos8
     - centos7
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - fc36
     - fc35
@@ -43,8 +43,8 @@ build-vdi-firefox:
     - master
     - centos8
     - centos7
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - fc36
     - fc35

diff --git a/.gitlab/ci/step-check.yaml b/.gitlab/ci/step-check.yaml
@@ -32,8 +32,8 @@ markdown:
     - centos8
     - centos7
     - centos6
-    - alma8
-    - rocky8
+    - alma
+    - rocky
     - alpine
     - ubi8
     - fc36

diff --git a/.gitlab/ci/step-test.yaml b/.gitlab/ci/step-test.yaml
@@ -6,7 +6,7 @@ include:
   - template: Security/Dependency-Scanning.gitlab-ci.yml
   - template: Security/License-Scanning.gitlab-ci.yml
   - template: Security/SAST.gitlab-ci.yml
-  - template: Security/Secret-Detection.gitlab-ci.yml
+  # - template: Security/Secret-Detection.gitlab-ci.yml
   - template: DAST.gitlab-ci.yml
 
 
@@ -18,8 +18,8 @@ sast:
   stage: test
   variables:
     VALIDATE_SCHEMA: "true"
-.secret-analyzer:
-  stage: test
+# .secret-analyzer:
+#   stage: test
 
 
 # Your selected site and scanner profiles:

diff --git a/.gitlab/img/os-alma.svg b/.gitlab/img/os-alma.svg
diff --git a/.gitlab/img/os-alpine.svg b/.gitlab/img/os-alpine.svg