fix rebase issue

centreon · Jan 19, 2024 · 589e108 · 589e108
1 parent 550ff7a
commit 589e108
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 35 deletions.
diff --git a/.github/workflows/centreon-collect.yml b/.github/workflows/centreon-collect.yml
@@ -46,36 +46,6 @@ jobs:
   get-version:
     uses: ./.github/workflows/get-version.yml
 
-  unit-test:
-    needs: [get-version]
-    if: ${{ ! contains(fromJson('["stable"]'), needs.get-version.outputs.stability) }}
-    runs-on: [self-hosted, collect]
-
-    strategy:
-      fail-fast: false
-      matrix:
-        image: [alma8, alma9, debian-bullseye]
-    name: unit test ${{ matrix.image }}
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Login to Registry
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
-        with:
-          registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
-          username: ${{ secrets.DOCKER_REGISTRY_ID }}
-          password: ${{ secrets.DOCKER_REGISTRY_PASSWD }}
-
-      - name: Test ${{ matrix.image }}
-        uses: ./.github/actions/runner-docker
-        with:
-          registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
-          script_name: /src/.github/scripts/collect-unit-tests
-          image_name: centreon-collect-${{ matrix.image }}
-          image_version: ${{ needs.get-version.outputs.img_version }}
-
   package:
     needs: [get-version]
     if: ${{ ! contains(fromJson('["stable"]'), needs.get-version.outputs.stability) }}
@@ -201,15 +171,18 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Restore binaries from cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: collect-binaries.tar
           key: binaries-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.sha }}
           fail-on-cache-miss: true
 
       - name: untar binaries
         shell: bash
-        run: tar -xf collect-binaries.tar
+        run: |
+          ls -l .
+          tar -xf collect-binaries.tar
+          ls -l .
 
       - name: Login to Registry
         uses: docker/login-action@v2

diff --git a/.github/workflows/package-collect.yml b/.github/workflows/package-collect.yml
@@ -146,14 +146,14 @@ jobs:
 
       - name: Tar binaries
         # used only to generate engine image only for develop
-        if: ${{  needs.get-version.outputs.branch == 'develop' }}
+        #if: ${{  needs.get-version.outputs.branch == 'develop' }}
         shell: bash
         run: tar -cf collect-binaries.tar  bin/centengine bin/centreon_connector_perl bin/centreon_connector_ssh lib/*.so
 
       - name: Save binaries in cache
         # used only to generate engine image only for develop
-        if: ${{  needs.get-version.outputs.branch == 'develop' }}
-        uses: actions/cache/save@v3
+        #if: ${{  needs.get-version.outputs.branch == 'develop' }}
+        uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: collect-binaries.tar
           key: binaries-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.sha }}