From 339efda7c07bf294756ca7297056cc6a053c3f2f Mon Sep 17 00:00:00 2001
From: jnasselle <jnasselle@gmail.com>
Date: Thu, 1 Jun 2023 03:38:15 -0300
Subject: [PATCH] Minor fixes on GH Actions

---
 .github/workflows/build-deb-packages.yml |  2 +-
 .github/workflows/build-rpm-packages.yml |  2 +-
 .github/workflows/test-install-deb.yml   |  7 +++---
 .github/workflows/test-install-rpm.yml   | 27 ++++++++++++------------
 rpms/CentOS/7/x86_64/Dockerfile          |  2 +-
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml
index 2392a6fe67..7d281caa26 100644
--- a/.github/workflows/build-deb-packages.yml
+++ b/.github/workflows/build-deb-packages.yml
@@ -41,7 +41,7 @@ jobs:
               - 'debs/Debian/7/i386/**'
               - 'debs/build.sh'
             deb_images_manager_amd64:
-              - 'debs/Debian/8/md64/**'
+              - 'debs/Debian/8/amd64/**'
               - 'debs/build.sh'
             deb_images_agent_amd64:
               - 'debs/Debian/7/amd64/**'
diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml
index 813ae49211..367c86f369 100644
--- a/.github/workflows/build-rpm-packages.yml
+++ b/.github/workflows/build-rpm-packages.yml
@@ -57,7 +57,7 @@ jobs:
           MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)
           if [ "${{ steps.changes.outputs.rpm_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi
           if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
-          if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi
+          if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_agent_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi
 
       - name: Download docker image for package building
         if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64')
diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml
index bd1fadc7fa..4d866999b7 100644
--- a/.github/workflows/test-install-deb.yml
+++ b/.github/workflows/test-install-deb.yml
@@ -11,8 +11,6 @@ jobs:
 
   Wait-for-package-building:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - name: Cancel previous runs
         uses: fkirc/skip-duplicate-actions@master
@@ -56,10 +54,11 @@ jobs:
               - 'debs/Debian/**'
               - 'debs/build.sh'
             deb_images_i386:
-              - 'debs/Debian/i386/**'
+              - 'debs/Debian/7/i386/**'
               - 'debs/build.sh'
             deb_images_amd64:
-              - 'debs/Debian/amd64/**'
+              - 'debs/Debian/7/amd64/**'
+              - 'debs/Debian/8/amd64/**'
               - 'debs/build.sh'
             deb_packages:
               - 'debs/SPECS/**'
diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml
index a44498a53a..c9eed2f4f9 100644
--- a/.github/workflows/test-install-rpm.yml
+++ b/.github/workflows/test-install-rpm.yml
@@ -10,8 +10,6 @@ on:
 jobs:
   Wait-for-package-building:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - name: Cancel previous runs
         uses: fkirc/skip-duplicate-actions@master
@@ -34,18 +32,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        system: [
-        {NAME: 'oraclelinux:9', ARCH: "x86_64"},
-        {NAME: 'almalinux:9', ARCH: "x86_64"},
-        {NAME: 'rockylinux:9', ARCH: "x86_64"},
-        {NAME: 'centos:7', ARCH: "x86_64"},
-        {NAME: 'centos:8', ARCH: "x86_64"},
-        {NAME: 'i386/centos:7', ARCH: "i386"},
-        {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"},
-        {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"},
-        {NAME: 'amazonlinux:2', ARCH: "x86_64"},
-        {NAME: 'fedora:34', ARCH: "x86_64"},
-        {NAME: 'centos:6.9', ARCH: "x86_64", INIT: "initd"}]
+        system:
+        - {NAME: 'oraclelinux:9', ARCH: "x86_64"}
+        - {NAME: 'almalinux:9', ARCH: "x86_64"}
+        - {NAME: 'rockylinux:9', ARCH: "x86_64"}
+        - {NAME: 'centos:7', ARCH: "x86_64"}
+        - {NAME: 'centos:8', ARCH: "x86_64"}
+        - {NAME: 'i386/centos:7', ARCH: "i386"}
+        - {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}
+        - {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}
+        - {NAME: 'amazonlinux:2', ARCH: "x86_64"}
+        - {NAME: 'fedora:34', ARCH: "x86_64"}
+        - {NAME: 'centos:6.9', ARCH: "x86_64", INIT: "initd"}
         type: [agent, manager]
         exclude:
           - system: {ARCH: "i386"}
@@ -69,6 +67,7 @@ jobs:
               - 'rpms/build.sh'
             rpm_images_x86_64:
               - 'rpms/CentOS/6/x86_64/**'
+              - 'rpms/CentOS/7/x86_64/**'
               - 'rpms/build.sh'
             rpm_packages:
               - 'rpms/SPECS/**'
diff --git a/rpms/CentOS/7/x86_64/Dockerfile b/rpms/CentOS/7/x86_64/Dockerfile
index 04ac405115..e5bd06ac20 100644
--- a/rpms/CentOS/7/x86_64/Dockerfile
+++ b/rpms/CentOS/7/x86_64/Dockerfile
@@ -59,4 +59,4 @@ ADD build.sh /usr/local/bin/build_package
 RUN chmod +x /usr/local/bin/build_package
 
 # Set the entrypoint
-ENTRYPOINT ["/usr/local/bin/build_package"]
\ No newline at end of file
+ENTRYPOINT ["/usr/local/bin/build_package"]