Revert "Dev: github-actions: do not use -d (#1572)"

This reverts commit efaaf44.
ClusterLabs · Oct 26, 2024 · 1a43dbe · 1a43dbe
1 parent f837d86
commit 1a43dbe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 151 deletions.
diff --git a/.github/workflows/crmsh-ci.yml b/.github/workflows/crmsh-ci.yml
@@ -61,21 +61,7 @@ jobs:
     - name: functional test for crm_report bugs
       run:  |
         index=`$GET_INDEX_OF crm_report_bugs`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_crm_report_bugs_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for crm_report bugs
-      run:  |
-        index=`$GET_INDEX_OF crm_report_bugs`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -89,21 +75,7 @@ jobs:
     - name: functional test for crm_report normal
       run:  |
         index=`$GET_INDEX_OF crm_report_normal`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_crm_report_normal_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for crm_report normal
-      run:  |
-        index=`$GET_INDEX_OF crm_report_normal`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -243,21 +215,7 @@ jobs:
     - name: functional test for qdevice options
       run:  |
         index=`$GET_INDEX_OF qdevice_options`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_qdevice_options_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for qdevice options
-      run:  |
-        index=`$GET_INDEX_OF qdevice_options`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -299,21 +257,7 @@ jobs:
     - name: functional test for qdevice user case
       run:  |
         index=`$GET_INDEX_OF qdevice_usercase`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_qdevice_user_case_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for qdevice user case
-      run:  |
-        index=`$GET_INDEX_OF qdevice_usercase`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -327,21 +271,7 @@ jobs:
     - name: functional test for resource failcount
       run:  |
         index=`$GET_INDEX_OF resource_failcount`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_resource_failcount_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for resource failcount
-      run:  |
-        index=`$GET_INDEX_OF resource_failcount`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -383,21 +313,7 @@ jobs:
     - name: functional test for configure sublevel bugs
       run:  |
         index=`$GET_INDEX_OF configure_bugs`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_configure_sublevel_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for configure sublevel bugs
-      run:  |
-        index=`$GET_INDEX_OF configure_bugs`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -411,21 +327,7 @@ jobs:
     - name: functional test for constraints bugs
       run:  |
         index=`$GET_INDEX_OF constraints_bugs`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_constraints_bugs_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for constraints bugs
-      run:  |
-        index=`$GET_INDEX_OF constraints_bugs`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -439,21 +341,7 @@ jobs:
     - name: functional test for geo cluster
       run:  |
         index=`$GET_INDEX_OF geo_setup`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_geo_cluster_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for geo cluster
-      run:  |
-        index=`$GET_INDEX_OF geo_setup`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -467,21 +355,7 @@ jobs:
     - name: functional test for healthcheck
       run:  |
         index=`$GET_INDEX_OF healthcheck`
-        $CONTAINER_SCRIPT $index
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_healthcheck_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for healthcheck
-      run:  |
-        index=`$GET_INDEX_OF healthcheck`
-        $CONTAINER_SCRIPT $index -u
+        $CONTAINER_SCRIPT $index && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT $index -u
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -520,20 +394,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: functional test for ssh agent
       run:  |
-        $CONTAINER_SCRIPT `$GET_INDEX_OF ssh_agent`
-    - uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: integration
-
-  functional_test_ssh_agent_non_root:
-    runs-on: ubuntu-24.04
-    timeout-minutes: 40
-    steps:
-    - uses: actions/checkout@v4
-    - name: functional test for ssh agent
-      run:  |
-        $CONTAINER_SCRIPT `$GET_INDEX_OF ssh_agent` -u
+        $CONTAINER_SCRIPT `$GET_INDEX_OF ssh_agent` && $CONTAINER_SCRIPT -d && $CONTAINER_SCRIPT -u `$GET_INDEX_OF ssh_agent`
     - uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/codecov.yml b/codecov.yml
@@ -8,7 +8,7 @@ coverage:
         threshold: 0.35%
 codecov:
   notify:
-    after_n_builds: 37
+    after_n_builds: 28
 comment:
-  after_n_builds: 37
+  after_n_builds: 28
   layout: "condensed_header, flags, files, condensed_footer"