Merge pull request ComplianceAsCode#11331 from Mab879/add_gating_back…

…_to_master Add Gate tests back to master
sig-bsi-grundschutz · Dec 11, 2023 · 422ad65 · 422ad65
2 parents f4b0412 + 0b778e5
commit 422ad65
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 49 deletions.
diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml
@@ -35,14 +35,14 @@ jobs:
       - name: Update CA certificates
         run: update-ca-certificates
       - name: Zypper add factory repo - to install bats and ShellCheck
-        run: zypper --non-interactive ar  https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP5/standard/openSUSE:Backports:SLE-15-SP5.repo     
+        run: zypper --non-interactive ar  https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP5/standard/openSUSE:Backports:SLE-15-SP5.repo
       - name: Zypper auto import keys
         run: zypper  --gpg-auto-import-keys --non-interactive ref
       - name: Zypper refs
         run: zypper refs
       - name: Zypper refresh
-        run: zypper refresh    
-      - name: Install Deps           
+        run: zypper refresh
+      - name: Install Deps
         run: zypper install -y git cmake make bats openscap-utils python3 python3-rpm python3-pip python3-devel python3-PyYAML python3-Jinja2 python3-setuptools libxslt-tools libxml2-tools ShellCheck
       - name: Upgrade pip python
         run: pip install pip --upgrade
@@ -135,52 +135,6 @@ jobs:
         run: ctest -j2 --output-on-failure -E unique-stigids
         working-directory: ./build
 
-  validate-fedora:
-    name: Build, Test on Fedora Latest (Container)
-    runs-on: ubuntu-latest
-    container:
-      image: fedora:latest
-    steps:
-      - name: Install Deps
-        run: dnf install -y cmake make openscap-utils python3-pyyaml bats ansible python3-pip ShellCheck git gcc gcc-c++ python3-devel
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install deps python
-        run: pip install pcre2 -r requirements.txt -r test-requirements.txt
-      - name: Build
-        run: |-
-          ./build_product \
-              alinux2 \
-              alinux3 \
-              anolis23 \
-              anolis8 \
-              chromium \
-              fedora \
-              firefox \
-              rhcos4 \
-              rhel7 \
-              rhel8 \
-              rhel9 \
-              uos20 \
-              ocp4 \
-              eks
-        env:
-          ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF"
-      - name: Test
-        run: ctest -j2 --output-on-failure -E unique-stigids
-        working-directory: ./build
-      - name: "Set git safe directory, ref: https://github.com/actions/checkout/issues/760"
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - name: Upload coverage to Code Climate  # Requires: git package
-        if: ${{ github.repository == 'ComplianceAsCode/content' }}
-        uses: paambaati/[email protected]
-        env:
-          CC_TEST_REPORTER_ID: e67e068471d32b63f8e9561dba8f6a3f84dcc76b05ebfd98e44ced1a91cff854
-        with:
-          coverageLocations: build/tests/coverage.xml:coverage.py
-      - name: Validate gitmailmap
-        run: grep -E "\S" .mailmap | grep -Ev '^#' | git check-mailmap --stdin
-
   validate-fedora-rawhide:
     name: Build, Test on Fedora Rawhide (Container)
     runs-on: ubuntu-latest

diff --git a/.github/workflows/gate_fedora.yml b/.github/workflows/gate_fedora.yml
@@ -0,0 +1,54 @@
+name: Gate
+on:
+  merge_group:
+    branches: [ 'master' ]
+  push:
+    branches: ['*', '!stabilization*', '!stable*', 'master' ]
+  pull_request:
+    branches: [ 'master', 'stabilization*' ]
+jobs:
+    validate-fedora:
+        name: Build, Test on Fedora Latest (Container)
+        runs-on: ubuntu-latest
+        container:
+            image: fedora:latest
+        steps:
+            -   name: Install Deps
+                run: dnf install -y cmake make openscap-utils python3-pyyaml bats ansible python3-pip ShellCheck git gcc gcc-c++ python3-devel
+            -   name: Checkout
+                uses: actions/checkout@v4
+            -   name: Install deps python
+                run: pip install pcre2 -r requirements.txt -r test-requirements.txt
+            -   name: Build
+                run: |-
+                    ./build_product \
+                        alinux2 \
+                        alinux3 \
+                        anolis23 \
+                        anolis8 \
+                        chromium \
+                        fedora \
+                        firefox \
+                        rhcos4 \
+                        rhel7 \
+                        rhel8 \
+                        rhel9 \
+                        uos20 \
+                        ocp4 \
+                        eks
+                env:
+                    ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF"
+            -   name: Test
+                run: ctest -j2 --output-on-failure -E unique-stigids
+                working-directory: ./build
+            -   name: "Set git safe directory, ref: https://github.com/actions/checkout/issues/760"
+                run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+            -   name: Upload coverage to Code Climate  # Requires: git package
+                if: ${{ github.repository == 'ComplianceAsCode/content' }}
+                uses: paambaati/[email protected]
+                env:
+                    CC_TEST_REPORTER_ID: e67e068471d32b63f8e9561dba8f6a3f84dcc76b05ebfd98e44ced1a91cff854
+                with:
+                    coverageLocations: build/tests/coverage.xml:coverage.py
+            -   name: Validate gitmailmap
+                run: grep -E "\S" .mailmap | grep -Ev '^#' | git check-mailmap --stdin