diff --git a/.github/actions/runner-docker/action.yml b/.github/actions/runner-docker/action.yml deleted file mode 100644 index 8f943b43544..00000000000 --- a/.github/actions/runner-docker/action.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: "runner docker Centreon" -description: "runner docker Centreon" -inputs: - registry_url: - description: Docker registry url - required: true - script_name: - description: "script name" - required: true - image_name: - description: "image name" - required: true - image_version: - description: "image version" - required: true - env_variable: - description: "environnment variable" - required: false - params: - description: "params for script" - required: false - -runs: - using: "composite" - steps: - - run: docker run -i --entrypoint ${{ inputs.script_name }}.sh -v "$PWD:/src" ${{ inputs.env_variable }} ${{ inputs.registry_url }}/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }} - shell: bash diff --git a/.github/docker/Dockerfile.centreon-collect-alma8 b/.github/docker/Dockerfile.centreon-collect-alma8 deleted file mode 100644 index 22ac8077a34..00000000000 --- a/.github/docker/Dockerfile.centreon-collect-alma8 +++ /dev/null @@ -1,82 +0,0 @@ -ARG REGISTRY_URL - -FROM ${REGISTRY_URL}/almalinux:8 - -RUN bash -e <> /etc/yum.conf && \ -echo 'assumeyes=1' >> /etc/yum.conf && \ -sed -i 's/best=True/best=False/g' /etc/dnf/dnf.conf && \ -dnf install -y dnf-plugins-core -dnf config-manager --set-enabled powertools - -dnf install -y epel-release - -echo '[goreleaser] -name=GoReleaser -baseurl=https://repo.goreleaser.com/yum/ -enabled=1 -gpgcheck=0' | tee /etc/yum.repos.d/goreleaser.repo - -curl -LsS "https://r.mariadb.com/downloads/mariadb_repo_setup" | bash -s -- --skip-maxscale --os-type=rhel --os-version=8 --mariadb-server-version="mariadb-10.5" - -dnf install -y cmake \ - gcc \ - gcc-c++ \ - gdb \ - gettext \ - git \ - ninja-build \ - openssh-server \ - MariaDB-devel \ - MariaDB-shared \ - MariaDB-client \ - MariaDB-compat \ - MariaDB-common \ - MariaDB-server \ - gnutls-devel \ - libgcrypt-devel \ - lua-devel \ - make \ - perl-ExtUtils-Embed.noarch \ - python38 \ - python38-pip \ - perl-Thread-Queue \ - redhat-lsb \ - rrdtool-devel \ - selinux-policy-devel \ - yum-utils \ - perl-interpreter \ - zstd \ - nfpm-2.41.1 \ - openssl-devel \ - libssh2-devel \ - libcurl-devel \ - zlib-devel \ - perl-HTTP-Daemon-SSL.noarch \ - perl-JSON \ - sudo - -dnf update libarchive - -git clone --depth 1 -b 2024.01.12 https://github.com/Microsoft/vcpkg.git -./vcpkg/bootstrap-vcpkg.sh -mkdir /src - -EOF - -COPY vcpkg.json /src -COPY overlays /overlays -COPY custom-triplets /custom-triplets - -RUN bash -e <> /etc/yum.conf -echo 'assumeyes=1' >> /etc/yum.conf +# Base dnf configuration sed -i 's/best=True/best=False/g' /etc/dnf/dnf.conf +echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf + dnf install -y dnf-plugins-core dnf config-manager --set-enabled crb - dnf install -y epel-release -dnf --best install -y \ +dnf install --best -y \ gcc \ gcc-c++ \ - gdb \ git \ - openssh-server \ + lua \ mariadb-server \ mariadb \ - gnutls \ - libgcrypt \ - lua \ - perl-ExtUtils-Embed \ - perl-JSON \ + openssh-server \ python3 \ python3-devel \ python3-pip \ - perl-Thread-Queue \ - rrdtool \ perl-interpreter \ procps-ng \ - zstd \ psmisc \ - perl-HTTP-Daemon-SSL.noarch \ - sudo - -dnf clean all + perl-HTTP-Daemon-SSL \ + perl-JSON \ + rrdtool \ + sudo \ + zstd echo "install robot and dependencies" @@ -51,6 +41,8 @@ cd /tmp/collect .github/scripts/collect-prepare-test-robot.sh mariadb -/bin/rm -rf /tmp/collect +dnf remove -y gcc gcc-c++ python3-devel + +dnf clean all EOF diff --git a/.github/docker/Dockerfile.centreon-collect-debian-bookworm-test b/.github/docker/Dockerfile.centreon-collect-mariadb-bookworm-test similarity index 78% rename from .github/docker/Dockerfile.centreon-collect-debian-bookworm-test rename to .github/docker/Dockerfile.centreon-collect-mariadb-bookworm-test index f32688e3794..ce2d1701e68 100644 --- a/.github/docker/Dockerfile.centreon-collect-debian-bookworm-test +++ b/.github/docker/Dockerfile.centreon-collect-mariadb-bookworm-test @@ -2,30 +2,23 @@ ARG REGISTRY_URL FROM ${REGISTRY_URL}/debian:bookworm -COPY . /tmp/collect - -RUN bash -e <> /etc/yum.conf -echo 'assumeyes=1' >> /etc/yum.conf -sed -i 's/best=True/best=False/g' /etc/dnf/dnf.conf -dnf install -y dnf-plugins-core -dnf config-manager --set-enabled crb - -dnf install -y epel-release - -echo '[goreleaser] -name=GoReleaser -baseurl=https://repo.goreleaser.com/yum/ -enabled=1 -gpgcheck=0' | tee /etc/yum.repos.d/goreleaser.repo - -dnf --best install -y cmake \ - gcc \ - gcc-c++ \ - gdb \ - gettext \ - git \ - mariadb-connector-c-devel \ - ninja-build \ - openssh-server \ - mysql-server \ - mysql \ - gnutls-devel \ - iproute \ - libgcrypt-devel \ - lua-devel \ - make \ - perl-ExtUtils-Embed.noarch \ - python3 \ - python3-pip \ - perl-Thread-Queue \ - rrdtool-devel \ - yum-utils \ - perl-interpreter \ - procps-ng \ - zstd \ - nfpm-2.41.1 \ - openssl-devel \ - libssh2-devel \ - libcurl-devel \ - zlib-devel \ - perl-HTTP-Daemon-SSL.noarch \ - perl-JSON \ - sudo - -git clone -b 2024.01.12 https://github.com/Microsoft/vcpkg.git -./vcpkg/bootstrap-vcpkg.sh -mkdir /src - -EOF - -COPY vcpkg.json /src -COPY overlays /overlays -COPY custom-triplets /custom-triplets - -RUN bash -e <> /etc/yum.conf -echo 'assumeyes=1' >> /etc/yum.conf +# Base dnf configuration sed -i 's/best=True/best=False/g' /etc/dnf/dnf.conf +echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf + dnf install -y dnf-plugins-core dnf config-manager --set-enabled crb - dnf install -y epel-release -dnf --best install -y gcc \ +dnf install --best -y \ + gcc \ gcc-c++ \ - gdb \ git \ - openssh-server \ - mariadb-connector-c \ - mysql-server \ - mysql \ gnutls \ + iproute \ libgcrypt \ lua \ - perl-ExtUtils-Embed \ + mariadb-connector-c \ + mysql-server \ + mysql \ + openssh-server \ python3 \ python3-devel \ python3-pip \ - perl-Thread-Queue \ - rrdtool \ perl-interpreter \ procps-ng \ - zstd \ psmisc \ - sudo \ - perl-HTTP-Daemon-SSL.noarch \ + perl-HTTP-Daemon-SSL \ perl-JSON \ - iproute + perl-Thread-Queue \ + rrdtool \ + sudo \ + zstd dnf clean all @@ -52,6 +48,8 @@ cd /tmp/collect .github/scripts/collect-prepare-test-robot.sh mysql -/bin/rm -rf /tmp/collect +dnf remove -y gcc gcc-c++ python3-devel + +dnf clean all EOF diff --git a/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy b/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy deleted file mode 100644 index 751de86c6cb..00000000000 --- a/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy +++ /dev/null @@ -1,94 +0,0 @@ -ARG REGISTRY_URL - -FROM ${REGISTRY_URL}/ubuntu:jammy - -ENV DEBIAN_FRONTEND=noninteractive - -RUN bash -e <> /etc/dnf/dnf.conf + +dnf install -y dnf-plugins-core +dnf config-manager --set-enabled powertools +dnf install -y epel-release + +echo '[goreleaser] +name=GoReleaser +baseurl=https://repo.goreleaser.com/yum/ +enabled=1 +gpgcheck=0' | tee /etc/yum.repos.d/goreleaser.repo + +dnf install --best -y \ + git \ + lua-devel \ + make \ + selinux-policy-devel \ + yum-utils \ + perl-ExtUtils-Embed \ + perl-HTTP-Daemon-SSL \ + perl-interpreter \ + perl-JSON \ + perl-Thread-Queue \ + procps-ng \ + nfpm-2.41.1 \ + sudo \ + wget \ + zstd + +dnf update -y libarchive + +dnf clean all + +EOF + +FROM centreon_collect_packaging AS centreon_collect_packaging_vcpkg + +RUN bash -e <> /etc/yum.conf -echo 'assumeyes=1' >> /etc/yum.conf +# Base dnf configuration sed -i 's/best=True/best=False/g' /etc/dnf/dnf.conf +echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf + dnf install -y dnf-plugins-core dnf config-manager --set-enabled crb - dnf install -y epel-release echo '[goreleaser] @@ -19,56 +18,77 @@ baseurl=https://repo.goreleaser.com/yum/ enabled=1 gpgcheck=0' | tee /etc/yum.repos.d/goreleaser.repo -dnf --best install -y cmake \ - gcc \ - gcc-c++ \ - gdb \ - gettext \ +dnf install --best -y \ git \ - ninja-build \ - openssh-server \ - mariadb-server \ - mariadb \ - mariadb-connector-c-devel \ - gnutls-devel \ - libgcrypt-devel \ lua-devel \ make \ - perl-ExtUtils-Embed.noarch \ - perl-JSON \ - python3 \ - python3-pip \ - perl-Thread-Queue \ - rrdtool-devel \ selinux-policy-devel \ yum-utils \ + perl-ExtUtils-Embed \ perl-interpreter \ + perl-Thread-Queue \ procps-ng \ - zstd \ nfpm-2.41.1 \ - openssl-devel \ - libssh2-devel \ + sudo \ + wget \ + zstd + +dnf clean all + +EOF + +FROM centreon_collect_packaging AS centreon_collect_packaging_vcpkg + +RUN bash -e < /etc/apt/apt.conf.d/99custom + +apt-get update +apt-get install -y ca-certificates + +echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list + +apt-get update + +apt-get install -y \ + curl \ + git \ + libperl-dev \ + make \ + nfpm=2.41.1 \ + perl-base \ + sudo \ + unzip \ + wget \ + zip \ + zstd + +apt-get clean + +EOF + +FROM centreon_collect_packaging AS centreon_collect_packaging_vcpkg RUN bash -e < /dev/null; then - if [[ "${{ matrix.distrib }}" == "alma8" || "${{ matrix.distrib }}" == "alma9" ]]; then - dnf install -y wget - else - apt-get update - apt-get install -y wget - fi - fi - - wget https://github.com/mozilla/sccache/releases/download/v0.8.1/sccache-v0.8.1-x86_64-unknown-linux-musl.tar.gz - tar xzf sccache-v0.8.1-x86_64-unknown-linux-musl.tar.gz - mv sccache-v0.8.1-x86_64-unknown-linux-musl/sccache /usr/bin/ + wget https://github.com/mozilla/sccache/releases/download/v0.9.1/sccache-v0.9.1-x86_64-unknown-linux-musl.tar.gz + tar xzf sccache-v0.9.1-x86_64-unknown-linux-musl.tar.gz + mv sccache-v0.9.1-x86_64-unknown-linux-musl/sccache /usr/bin/ ${SCCACHE_PATH} --start-server shell: bash @@ -237,6 +228,14 @@ jobs: working-directory: build shell: bash + - name: Upload test results + if: ${{ failure() }} + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + with: + name: unit-test-${{ matrix.distrib }}-reports + path: "build/ut_*.xml" + retention-days: 1 + package: needs: [get-environment] if: | @@ -246,33 +245,35 @@ jobs: fail-fast: false matrix: include: - - image: centreon-collect-alma8 + - image: packaging-centreon-collect-vcpkg-alma8 distrib: el8 package_extension: rpm - runner: collect + runner: [self-hosted, collect] arch: amd64 - - image: centreon-collect-alma9 + - image: packaging-centreon-collect-vcpkg-alma9 distrib: el9 package_extension: rpm - runner: collect + runner: [self-hosted, collect] arch: amd64 - - image: centreon-collect-debian-bookworm + - image: packaging-centreon-collect-vcpkg-bookworm distrib: bookworm package_extension: deb - runner: collect + runner: [self-hosted, collect] arch: amd64 - - image: centreon-collect-debian-bookworm-arm64 + - image: packaging-centreon-collect-vcpkg-bookworm-arm64 distrib: bookworm package_extension: deb - runner: collect-arm64 + runner: [self-hosted, collect-arm64] arch: arm64 + name: package ${{ matrix.distrib }} ${{ contains(toJson(matrix.runner), 'arm') && ' arm' || '' }} + uses: ./.github/workflows/package-collect.yml with: major_version: ${{ needs.get-environment.outputs.major_version }} minor_version: ${{ needs.get-environment.outputs.minor_version }} - img_version: ${{ needs.get-environment.outputs.img_version }} + img_version: ${{ needs.get-environment.outputs.packaging_img_version }} release: ${{ needs.get-environment.outputs.release }} commit_hash: ${{ github.sha }} stability: ${{ needs.get-environment.outputs.stability }} @@ -282,7 +283,7 @@ jobs: image: ${{ matrix.image }} distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} - runner: ${{ matrix.runner }} + runner: ${{ toJSON(matrix.runner) }} arch: ${{ matrix.arch }} is_nightly: ${{ needs.get-environment.outputs.is_nightly }} secrets: @@ -313,7 +314,7 @@ jobs: matrix: include: - distrib: el9 - image: centreon-collect-alma9-test + image: centreon-collect-mariadb-alma9-test package_extension: rpm arch: amd64 database_type: mariadb @@ -327,21 +328,21 @@ jobs: test_group_name: robot_test-mysql-el9-amd64 tests_params: '{}' - distrib: bookworm - image: centreon-collect-debian-bookworm-arm64-test + image: centreon-collect-mariadb-bookworm-arm64-test package_extension: deb arch: arm64 database_type: mariadb test_group_name: robot_test-mariadb-bookworm-arm64 tests_params: '{}' - distrib: bookworm - image: centreon-collect-debian-bookworm-test + image: centreon-collect-mariadb-bookworm-test package_extension: deb arch: amd64 database_type: mariadb test_group_name: robot_test-mariadb-bookworm-amd64 tests_params: '{}' - distrib: el9 - image: centreon-collect-alma9-test + image: centreon-collect-mariadb-alma9-test package_extension: rpm arch: amd64 database_type: mariadb @@ -356,7 +357,6 @@ jobs: arch: ${{ matrix.arch }} image: ${{ matrix.image }} image_test: ${{ matrix.image }}:${{ needs.get-environment.outputs.test_img_version }} - image_version: ${{ needs.get-environment.outputs.img_version }} package_cache_key: ${{ github.run_id }}-${{ github.sha }}-${{ matrix.package_extension }}-centreon-collect-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} package_cache_path: ./*.${{ matrix.package_extension }} database_type: ${{ matrix.database_type }} diff --git a/.github/workflows/centreon-common.yml b/.github/workflows/centreon-common.yml index aaf0d0f13a5..1d4658bbca8 100644 --- a/.github/workflows/centreon-common.yml +++ b/.github/workflows/centreon-common.yml @@ -39,19 +39,19 @@ jobs: matrix: include: - package_extension: rpm - image: centreon-collect-alma8 + image: packaging-centreon-collect-alma8 distrib: el8 - package_extension: rpm - image: centreon-collect-alma9 + image: packaging-centreon-collect-alma9 distrib: el9 - package_extension: deb - image: centreon-collect-debian-bookworm + image: packaging-centreon-collect-bookworm distrib: bookworm runs-on: ubuntu-24.04 container: - image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.img_version }} + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.packaging_img_version }} credentials: username: ${{ secrets.HARBOR_CENTREON_PULL_USERNAME }} password: ${{ secrets.HARBOR_CENTREON_PULL_TOKEN }} diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml deleted file mode 100644 index 0ce5a4c692f..00000000000 --- a/.github/workflows/docker-builder.yml +++ /dev/null @@ -1,151 +0,0 @@ -name: docker-builder - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -on: - workflow_dispatch: - push: - branches: - - develop - - dev-[2-9][0-9].[0-9][0-9].x - paths: - - '.github/docker/Dockerfile.centreon-collect-*' - pull_request: - paths: - - '.github/docker/Dockerfile.centreon-collect-*' - -jobs: - get-environment: - if: github.repository == 'centreon/centreon-collect' - uses: ./.github/workflows/get-environment.yml - with: - version_file: CMakeLists.txt - - dockerize: - needs: [get-environment] - if: | - needs.get-environment.outputs.skip_workflow == 'false' && - needs.get-environment.outputs.stability != 'stable' - - strategy: - fail-fast: false - matrix: - include: - - runner: collect - dockerfile: centreon-collect-alma8 - image: centreon-collect-alma8 - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect - dockerfile: centreon-collect-alma9 - image: centreon-collect-alma9 - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect - dockerfile: centreon-collect-alma9-test - image: centreon-collect-alma9-test - tag: ${{ needs.get-environment.outputs.test_img_version }} - - runner: collect - dockerfile: centreon-collect-mysql-alma9 - image: centreon-collect-mysql-alma9 - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect - dockerfile: centreon-collect-mysql-alma9-test - image: centreon-collect-mysql-alma9-test - tag: ${{ needs.get-environment.outputs.test_img_version }} - - runner: collect - dockerfile: centreon-collect-debian-bullseye - image: centreon-collect-debian-bullseye - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect - dockerfile: centreon-collect-debian-bullseye-test - image: centreon-collect-debian-bullseye-test - tag: ${{ needs.get-environment.outputs.test_img_version }} - - runner: collect - dockerfile: centreon-collect-debian-bookworm - image: centreon-collect-debian-bookworm - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect - dockerfile: centreon-collect-debian-bookworm-test - image: centreon-collect-debian-bookworm-test - tag: ${{ needs.get-environment.outputs.test_img_version }} - - runner: collect - dockerfile: centreon-collect-ubuntu-jammy - image: centreon-collect-ubuntu-jammy - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect - dockerfile: centreon-collect-ubuntu-jammy-test - image: centreon-collect-ubuntu-jammy-test - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect-arm64 - dockerfile: centreon-collect-debian-bullseye - image: centreon-collect-debian-bullseye-arm64 - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect-arm64 - dockerfile: centreon-collect-debian-bullseye-test - image: centreon-collect-debian-bullseye-arm64-test - tag: ${{ needs.get-environment.outputs.test_img_version }} - - runner: collect-arm64 - dockerfile: centreon-collect-debian-bookworm - image: centreon-collect-debian-bookworm-arm64 - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect-arm64 - dockerfile: centreon-collect-debian-bookworm-test - image: centreon-collect-debian-bookworm-arm64-test - tag: ${{ needs.get-environment.outputs.test_img_version }} - - runner: collect-arm64 - dockerfile: centreon-collect-ubuntu-jammy - image: centreon-collect-ubuntu-jammy-arm64 - tag: ${{ needs.get-environment.outputs.img_version }} - - runner: collect-arm64 - dockerfile: centreon-collect-ubuntu-jammy-test - image: centreon-collect-ubuntu-jammy-test-arm64 - tag: ${{ needs.get-environment.outputs.img_version }} - - runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', matrix.runner)) }} - - name: build container ${{ matrix.image }} - - steps: - - name: Checkout sources - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - - name: Login to Registry - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} - username: ${{ secrets.HARBOR_CENTREON_PUSH_USERNAME }} - password: ${{ secrets.HARBOR_CENTREON_PUSH_TOKEN }} - - - name: Login to Proxy Registry - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - registry: ${{ vars.DOCKER_PROXY_REGISTRY_URL }} - username: ${{ secrets.HARBOR_CENTREON_PUSH_USERNAME }} - password: ${{ secrets.HARBOR_CENTREON_PUSH_TOKEN }} - - - uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0 - with: - driver-opts: image=${{ vars.DOCKER_PROXY_REGISTRY_URL }}/moby/buildkit:buildx-stable-1 - - - name: Build image ${{ matrix.image }}:${{ matrix.tag }} - uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0 - with: - file: .github/docker/Dockerfile.${{ matrix.dockerfile }} - context: . - build-args: | - "REGISTRY_URL=${{ vars.DOCKER_PROXY_REGISTRY_URL }}" - "TRIPLET=${{ contains(matrix.runner, 'arm') && 'arm64-linux' || 'x64-linux' }}" - platforms: ${{ contains(matrix.runner, 'arm') && 'linux/arm64' || 'linux/amd64' }} - pull: true - push: true - tags: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ matrix.tag }} - - set-skip-label: - needs: [get-environment, dockerize] - if: | - needs.get-environment.outputs.skip_workflow == 'false' && - ! cancelled() && - ! contains(needs.*.result, 'failure') && - ! contains(needs.*.result, 'cancelled') - uses: ./.github/workflows/set-pull-request-skip-label.yml diff --git a/.github/workflows/docker-collect-testing.yml b/.github/workflows/docker-collect-testing.yml new file mode 100644 index 00000000000..35872143c55 --- /dev/null +++ b/.github/workflows/docker-collect-testing.yml @@ -0,0 +1,105 @@ +name: docker-collect-testing + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +on: + workflow_dispatch: + push: + branches: + - develop + - dev-[2-9][0-9].[0-9][0-9].x + paths: + - '.github/docker/Dockerfile.centreon-collect-*-test' + - '.github/scripts/collect-prepare-test-robot.sh' + - '.github/scripts/collect-setup-database.sh' + - 'vcpkg.json' + - 'resources/*.sql' + pull_request: + paths: + - '.github/docker/Dockerfile.centreon-collect-*-test' + - '.github/scripts/collect-prepare-test-robot.sh' + - '.github/scripts/collect-setup-database.sh' + - 'vcpkg.json' + - 'resources/*.sql' + +jobs: + get-environment: + if: github.repository == 'centreon/centreon-collect' + uses: ./.github/workflows/get-environment.yml + with: + version_file: CMakeLists.txt + + dockerize: + needs: [get-environment] + if: | + needs.get-environment.outputs.skip_workflow == 'false' && + needs.get-environment.outputs.stability != 'stable' + + strategy: + fail-fast: false + matrix: + include: + - runner: [self-hosted, collect] + distrib: alma9 + database: mariadb + - runner: [self-hosted, collect] + distrib: alma9 + database: mysql + dockerfile: centreon-collect-mysql-alma9-test + image: centreon-collect-mysql-alma9-test + - runner: [self-hosted, collect] + distrib: bookworm + database: mariadb + - runner: [self-hosted, collect-arm64] + distrib: bookworm + database: mariadb + + runs-on: ${{ matrix.runner }} + + name: build docker image ${{ matrix.database }} ${{ matrix.distrib }} ${{ contains(toJson(matrix.runner), 'arm') && ' arm' || '' }} + + env: + IMAGE_NAME: centreon-collect-${{ matrix.database }}-${{ matrix.distrib }}${{ contains(toJson(matrix.runner), 'arm') && '-arm64' || '' }}-test + + steps: + - name: Checkout sources + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Login to Registry + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 + with: + registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} + username: ${{ secrets.HARBOR_CENTREON_PUSH_USERNAME }} + password: ${{ secrets.HARBOR_CENTREON_PUSH_TOKEN }} + + - uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0 + with: + driver-opts: image=${{ vars.DOCKER_PROXY_REGISTRY_URL }}/moby/buildkit:buildx-stable-1 + + - name: Build image ${{ env.IMAGE_NAME }}:${{ needs.get-environment.outputs.test_img_version }} + uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0 + env: + DOCKER_BUILD_RECORD_UPLOAD: false + DOCKER_BUILD_SUMMARY: false + DOCKER_BUILD_CHECKS_ANNOTATIONS: false + with: + file: .github/docker/Dockerfile.centreon-collect-${{ matrix.database }}-${{ matrix.distrib }}-test + context: . + build-args: | + "REGISTRY_URL=${{ vars.DOCKER_PROXY_REGISTRY_URL }}" + "TRIPLET=${{ contains(toJson(matrix.runner), 'arm') && 'arm64-linux' || 'x64-linux' }}" + platforms: ${{ contains(toJson(matrix.runner), 'arm') && 'linux/arm64' || 'linux/amd64' }} + pull: true + push: true + tags: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ env.IMAGE_NAME }}:${{ needs.get-environment.outputs.test_img_version }} + + set-skip-label: + needs: [get-environment, dockerize] + if: | + needs.get-environment.outputs.skip_workflow == 'false' && + ! cancelled() && + ! contains(needs.*.result, 'failure') && + ! contains(needs.*.result, 'cancelled') + uses: ./.github/workflows/set-pull-request-skip-label.yml diff --git a/.github/workflows/docker-packaging.yml b/.github/workflows/docker-packaging.yml new file mode 100644 index 00000000000..6dd8a51c970 --- /dev/null +++ b/.github/workflows/docker-packaging.yml @@ -0,0 +1,113 @@ +name: docker-packaging + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +on: + workflow_dispatch: + push: + branches: + - develop + - dev-[2-9][0-9].[0-9][0-9].x + paths: + - '.github/docker/Dockerfile.packaging-*' + - 'vcpkg.json' + pull_request: + paths: + - '.github/docker/Dockerfile.packaging-*' + - 'vcpkg.json' + +jobs: + get-environment: + if: github.repository == 'centreon/centreon-collect' + uses: ./.github/workflows/get-environment.yml + with: + version_file: CMakeLists.txt + + dockerize: + needs: [get-environment] + if: | + needs.get-environment.outputs.skip_workflow == 'false' && + needs.get-environment.outputs.stability != 'stable' + + strategy: + fail-fast: false + matrix: + include: + - runner: [self-hosted, collect] + distrib: alma8 + - runner: [self-hosted, collect] + distrib: alma9 + - runner: [self-hosted, collect] + distrib: bookworm + - runner: [self-hosted, collect-arm64] + distrib: bookworm + + runs-on: ${{ matrix.runner }} + + name: build docker image ${{ matrix.distrib }} ${{ contains(toJson(matrix.runner), 'arm') && ' arm' || '' }} + + env: + IMAGE_BASE_NAME: packaging-centreon-collect + IMAGE_SUFFIX: ${{ contains(toJson(matrix.runner), 'arm') && '-arm64' || '' }} + + steps: + - name: Checkout sources + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Login to Registry + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 + with: + registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} + username: ${{ secrets.HARBOR_CENTREON_PUSH_USERNAME }} + password: ${{ secrets.HARBOR_CENTREON_PUSH_TOKEN }} + + - uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0 + with: + driver-opts: image=${{ vars.DOCKER_PROXY_REGISTRY_URL }}/moby/buildkit:buildx-stable-1 + + - name: Build image ${{ env.IMAGE_BASE_NAME }}-${{ matrix.distrib }}${{ env.IMAGE_SUFFIX }}:${{ needs.get-environment.outputs.packaging_img_version }} + uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0 + env: + DOCKER_BUILD_RECORD_UPLOAD: false + DOCKER_BUILD_SUMMARY: false + DOCKER_BUILD_CHECKS_ANNOTATIONS: false + with: + file: .github/docker/Dockerfile.${{ env.IMAGE_BASE_NAME }}-${{ matrix.distrib }} + context: . + target: centreon_collect_packaging + build-args: | + "REGISTRY_URL=${{ vars.DOCKER_PROXY_REGISTRY_URL }}" + "TRIPLET=${{ contains(toJson(matrix.runner), 'arm') && 'arm64-linux' || 'x64-linux' }}" + platforms: ${{ contains(toJson(matrix.runner), 'arm') && 'linux/arm64' || 'linux/amd64' }} + pull: true + push: true + tags: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ env.IMAGE_BASE_NAME }}-${{ matrix.distrib }}${{ env.IMAGE_SUFFIX }}:${{ needs.get-environment.outputs.packaging_img_version }} + + - name: Build image ${{ env.IMAGE_BASE_NAME }}-vcpk-${{ matrix.distrib }}${{ env.IMAGE_SUFFIX }}:${{ needs.get-environment.outputs.packaging_img_version }} + uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0 + env: + DOCKER_BUILD_RECORD_UPLOAD: false + DOCKER_BUILD_SUMMARY: false + DOCKER_BUILD_CHECKS_ANNOTATIONS: false + with: + file: .github/docker/Dockerfile.${{ env.IMAGE_BASE_NAME }}-${{ matrix.distrib }} + context: . + target: centreon_collect_packaging_vcpkg + build-args: | + "REGISTRY_URL=${{ vars.DOCKER_PROXY_REGISTRY_URL }}" + "TRIPLET=${{ contains(toJson(matrix.runner), 'arm') && 'arm64-linux' || 'x64-linux' }}" + platforms: ${{ contains(toJson(matrix.runner), 'arm') && 'linux/arm64' || 'linux/amd64' }} + pull: false + push: true + tags: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ env.IMAGE_BASE_NAME }}-vcpkg-${{ matrix.distrib }}${{ env.IMAGE_SUFFIX }}:${{ needs.get-environment.outputs.packaging_img_version }} + + set-skip-label: + needs: [get-environment, dockerize] + if: | + needs.get-environment.outputs.skip_workflow == 'false' && + ! cancelled() && + ! contains(needs.*.result, 'failure') && + ! contains(needs.*.result, 'cancelled') + uses: ./.github/workflows/set-pull-request-skip-label.yml diff --git a/.github/workflows/get-environment.yml b/.github/workflows/get-environment.yml index 8f9c9ebacfa..8f4e37a5290 100644 --- a/.github/workflows/get-environment.yml +++ b/.github/workflows/get-environment.yml @@ -45,9 +45,9 @@ on: is_nightly: description: "if the current workflow run is considered a nightly" value: ${{ jobs.get-environment.outputs.is_nightly }} - img_version: - description: "docker image version (vcpkg checksum)" - value: ${{ jobs.get-environment.outputs.img_version }} + packaging_img_version: + description: "docker image version for packaging (vcpkg checksum)" + value: ${{ jobs.get-environment.outputs.packaging_img_version }} test_img_version: description: "test docker image version (checksum of database sql, script and dockerfiles)" value: ${{ jobs.get-environment.outputs.test_img_version }} @@ -74,7 +74,7 @@ jobs: release_type: ${{ steps.get_release_type.outputs.release_type }} is_targeting_feature_branch: ${{ steps.get_stability.outputs.is_targeting_feature_branch }} is_nightly: ${{ steps.get_nightly_status.outputs.is_nightly }} - img_version: ${{ steps.get_docker_images_version.outputs.img_version }} + packaging_img_version: ${{ steps.get_docker_images_version.outputs.packaging_img_version }} test_img_version: ${{ steps.get_docker_images_version.outputs.test_img_version }} skip_workflow: ${{ steps.skip_workflow.outputs.result }} labels: ${{ steps.has_skip_label.outputs.labels }} @@ -413,8 +413,8 @@ jobs: - name: Get docker images version id: get_docker_images_version run: | - IMG_VERSION=$( cat `ls .github/docker/Dockerfile.centreon-collect-* | grep -v test` vcpkg.json | md5sum | awk '{print substr($1, 0, 8)}') - echo "img_version=$IMG_VERSION" >> $GITHUB_OUTPUT + PACKAGING_IMG_VERSION=$(cat `ls .github/docker/Dockerfile.packaging-*` vcpkg.json | md5sum | awk '{print substr($1, 0, 8)}') + echo "packaging_img_version=$PACKAGING_IMG_VERSION" >> $GITHUB_OUTPUT TEST_IMG_VERSION=$(cat .github/docker/Dockerfile.centreon-collect-*-test .github/scripts/collect-prepare-test-robot.sh resources/*.sql | md5sum | cut -c1-8) echo "test_img_version=$TEST_IMG_VERSION" >> $GITHUB_OUTPUT @@ -436,7 +436,7 @@ jobs: ['release_type', '${{ steps.get_release_type.outputs.release_type || 'not defined because this is not a release' }}'], ['is_targeting_feature_branch', '${{ steps.get_stability.outputs.is_targeting_feature_branch }}'], ['is_nightly', '${{ steps.get_nightly_status.outputs.is_nightly }}'], - ['img_version', '${{ steps.get_docker_images_version.outputs.img_version }}'], + ['packaging_img_version', '${{ steps.get_docker_images_version.outputs.packaging_img_version }}'], ['test_img_version', '${{ steps.get_docker_images_version.outputs.test_img_version }}'], ['skip_workflow', '${{ steps.skip_workflow.outputs.result }}'], ['labels', '${{ steps.has_skip_label.outputs.labels }}'], diff --git a/.github/workflows/gorgone.yml b/.github/workflows/gorgone.yml index fe7651f6b3f..a4112ca19ff 100644 --- a/.github/workflows/gorgone.yml +++ b/.github/workflows/gorgone.yml @@ -133,19 +133,19 @@ jobs: distrib: [el8, el9, bookworm] # No ubuntu in 24.10, 24.11 or later for now include: - package_extension: rpm - image: packaging-nfpm-alma8 + image: packaging-centreon-collect-alma8 distrib: el8 - package_extension: rpm - image: packaging-nfpm-alma9 + image: packaging-centreon-collect-alma9 distrib: el9 - package_extension: deb - image: packaging-nfpm-bookworm + image: packaging-centreon-collect-bookworm distrib: bookworm runs-on: ubuntu-24.04 container: - image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.major_version }} + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.packaging_img_version }} credentials: username: ${{ secrets.HARBOR_CENTREON_PULL_USERNAME }} password: ${{ secrets.HARBOR_CENTREON_PULL_TOKEN }} diff --git a/.github/workflows/libzmq.yml b/.github/workflows/libzmq.yml index efbfc06adab..a9a7faf3e3a 100644 --- a/.github/workflows/libzmq.yml +++ b/.github/workflows/libzmq.yml @@ -34,17 +34,17 @@ jobs: fail-fast: false matrix: include: - - image: packaging-nfpm-alma8 + - image: packaging-centreon-collect-alma8 distrib: el8 arch: amd64 - - image: packaging-nfpm-alma9 + - image: packaging-centreon-collect-alma9 distrib: el9 arch: amd64 runs-on: ubuntu-24.04 container: - image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.major_version }} + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.packaging_img_version }} credentials: username: ${{ secrets.HARBOR_CENTREON_PULL_USERNAME }} password: ${{ secrets.HARBOR_CENTREON_PULL_TOKEN }} @@ -87,7 +87,7 @@ jobs: fail-fast: false matrix: include: - - image: packaging-nfpm-bookworm + - image: packaging-centreon-collect-bookworm distrib: bookworm runner: ubuntu-24.04 arch: amd64 @@ -99,7 +99,7 @@ jobs: runs-on: ${{ matrix.runner }} container: - image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.major_version }} + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.packaging_img_version }} credentials: username: ${{ secrets.HARBOR_CENTREON_PULL_USERNAME }} password: ${{ secrets.HARBOR_CENTREON_PULL_TOKEN }} @@ -119,7 +119,7 @@ jobs: - name: package deb run: | apt-get update - apt-get install -y debhelper dh-autoreconf dpkg-dev libkrb5-dev libnorm-dev libpgm-dev libsodium-dev libunwind8-dev libnss3-dev libgnutls28-dev libbsd-dev pkg-config asciidoc wget xmlto + apt-get install -y build-essential gcc g++ debhelper dh-autoreconf dpkg-dev libkrb5-dev libnorm-dev libpgm-dev libsodium-dev libunwind8-dev libnss3-dev libgnutls28-dev libbsd-dev pkg-config asciidoc wget xmlto wget -O - https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz | tar zxvf - cd zeromq-4.3.5 diff --git a/.github/workflows/lua-curl.yml b/.github/workflows/lua-curl.yml index e36ccbf7d27..1a100ac68f2 100644 --- a/.github/workflows/lua-curl.yml +++ b/.github/workflows/lua-curl.yml @@ -40,31 +40,31 @@ jobs: matrix: include: - package_extension: rpm - image: centreon-collect-alma8 + image: packaging-centreon-collect-alma8 distrib: el8 lua_version: 5.3 runner: ubuntu-24.04 arch: amd64 - package_extension: rpm - image: centreon-collect-alma9 + image: packaging-centreon-collect-alma9 distrib: el9 lua_version: 5.4 runner: ubuntu-24.04 arch: amd64 - package_extension: deb - image: centreon-collect-debian-bookworm + image: packaging-centreon-collect-bookworm distrib: bookworm lua_version: 5.3 runner: ubuntu-24.04 arch: amd64 # - package_extension: deb - # image: centreon-collect-ubuntu-jammy + # image: packaging-centreon-collect-ubuntu-jammy # distrib: jammy # lua_version: 5.3 # runner: ubuntu-24.04 # arch: amd64 - package_extension: deb - image: centreon-collect-debian-bookworm-arm64 + image: packaging-centreon-collect-bookworm-arm64 distrib: bookworm lua_version: 5.3 runner: ["self-hosted", "collect-arm64"] @@ -73,7 +73,7 @@ jobs: runs-on: ${{ matrix.runner }} container: - image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.img_version }} + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-environment.outputs.packaging_img_version }} credentials: username: ${{ secrets.HARBOR_CENTREON_PULL_USERNAME }} password: ${{ secrets.HARBOR_CENTREON_PULL_TOKEN }} @@ -106,7 +106,7 @@ jobs: cd .. else apt-get update - apt-get install -y make openssl libssl-dev libcurl4-openssl-dev lua${{ matrix.lua_version }} liblua${{ matrix.lua_version }} liblua${{ matrix.lua_version }}-dev + apt-get install -y make gcc openssl libssl-dev libcurl4-openssl-dev lua${{ matrix.lua_version }} liblua${{ matrix.lua_version }} liblua${{ matrix.lua_version }}-dev cd lua-curl-src make LUA_IMPL=lua${{ matrix.lua_version }} LUA_INC=/usr/include/lua${{ matrix.lua_version }} cd .. diff --git a/.github/workflows/package-collect.yml b/.github/workflows/package-collect.yml index 09f8adc847c..a562639048f 100644 --- a/.github/workflows/package-collect.yml +++ b/.github/workflows/package-collect.yml @@ -71,7 +71,7 @@ on: required: true jobs: package: - runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', inputs.runner)) }} + runs-on: ${{ fromJSON(inputs.runner) }} env: SCCACHE_PATH: "/usr/bin/sccache" @@ -94,20 +94,14 @@ jobs: - name: Install sccache run: | - if [ "${{ inputs.package_extension }}" = "deb" ]; then - apt-get update - apt-get install -y wget - elif [ "${{ inputs.package_extension }}" = "rpm" ]; then - dnf install -y wget - fi if [ "${{ inputs.arch }}" = "amd64" ]; then - wget https://github.com/mozilla/sccache/releases/download/v0.8.1/sccache-v0.8.1-x86_64-unknown-linux-musl.tar.gz - tar xzf sccache-v0.8.1-x86_64-unknown-linux-musl.tar.gz - mv sccache-v0.8.1-x86_64-unknown-linux-musl/sccache /usr/bin/ + wget https://github.com/mozilla/sccache/releases/download/v0.9.1/sccache-v0.9.1-x86_64-unknown-linux-musl.tar.gz + tar xzf sccache-v0.9.1-x86_64-unknown-linux-musl.tar.gz + mv sccache-v0.9.1-x86_64-unknown-linux-musl/sccache /usr/bin/ elif [ "${{ inputs.arch }}" = "arm64" ]; then - wget https://github.com/mozilla/sccache/releases/download/v0.8.1/sccache-v0.8.1-aarch64-unknown-linux-musl.tar.gz - tar xzf sccache-v0.8.1-aarch64-unknown-linux-musl.tar.gz - mv sccache-v0.8.1-aarch64-unknown-linux-musl/sccache /usr/bin/ + wget https://github.com/mozilla/sccache/releases/download/v0.9.1/sccache-v0.9.1-aarch64-unknown-linux-musl.tar.gz + tar xzf sccache-v0.9.1-aarch64-unknown-linux-musl.tar.gz + mv sccache-v0.9.1-aarch64-unknown-linux-musl/sccache /usr/bin/ fi ${SCCACHE_PATH} --start-server @@ -142,9 +136,11 @@ jobs: export TRIPLET=x64-linux-release fi - mv /root/.cache /github/home/ export VCPKG_ROOT="/vcpkg" export PATH="$VCPKG_ROOT:$PATH" + + mv /root/.cache /github/home/ + $CMAKE \ -B build \ -DVCPKG_OVERLAY_TRIPLETS=/custom-triplets \ diff --git a/.github/workflows/release-trigger-builds.yml b/.github/workflows/release-trigger-builds.yml index 9923dea7784..fb78fc3d6ac 100644 --- a/.github/workflows/release-trigger-builds.yml +++ b/.github/workflows/release-trigger-builds.yml @@ -48,8 +48,8 @@ jobs: #COMPONENTS_OSS_FULL=("awie" "dsm" "gorgone" "ha" "open-tickets" "web") #COMPONENTS_MODULES=("anomaly-detection" "autodiscovery" "bam" "cloud-business-extensions" "cloud-extensions" "it-edition-extensions" "lm" "map" "mbi" "ppm") #COMPONENTS_MODULES_FULL=("anomaly-detection" "autodiscovery" "bam" "cloud-business-extensions" "cloud-extensions" "it-edition-extensions" "lm" "map" "mbi" "ppm" "php-pecl-gnupg" "sourceguardian-loader") - COMPONENTS_COLLECT=("Centreon collect" "centreon-common" "gorgone" "Centreon Monitoring Agent Windows build and packaging") - COMPONENTS_COLLECT_FULL=("Centreon collect" "centreon-common" "gorgone" "Centreon Monitoring Agent Windows build and packaging" "docker-builder" "docker-gorgone-testing" "libzmq" "lua-curl") + COMPONENTS_COLLECT=("centreon-collect" "centreon-common" "gorgone" "windows-agent") + COMPONENTS_COLLECT_FULL=("centreon-collect" "centreon-common" "gorgone" "windows-agent" "docker-packaging" "docker-collect-testing" "docker-gorgone-testing" "libzmq" "lua-curl") RUNS_URL="" # Accept release prefixed or develop branches, nothing else diff --git a/.github/workflows/robot-test.yml b/.github/workflows/robot-test.yml index fa008c8e302..6fcde5a3fb6 100644 --- a/.github/workflows/robot-test.yml +++ b/.github/workflows/robot-test.yml @@ -13,9 +13,6 @@ on: image_test: required: true type: string - image_version: - required: true - type: string package_cache_key: required: true type: string @@ -250,14 +247,7 @@ jobs: echo "End of Deleting" shell: bash - # setup-python v5.0.0 relies on node20 which is not supported by el7 distributions - - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 - if: ${{ inputs.distrib == 'el7'}} - with: - python-version: "3.10" - - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 - if: ${{ inputs.distrib != 'el7' }} with: python-version: "3.10" diff --git a/.github/workflows/windows-agent-robot-test.yml b/.github/workflows/windows-agent-robot-test.yml index a55c21c0c79..6571cf9c6f2 100644 --- a/.github/workflows/windows-agent-robot-test.yml +++ b/.github/workflows/windows-agent-robot-test.yml @@ -21,14 +21,14 @@ jobs: with: major_version: ${{ needs.get-environment.outputs.major_version }} minor_version: ${{ needs.get-environment.outputs.minor_version }} - img_version: ${{ needs.get-environment.outputs.img_version }} + img_version: ${{ needs.get-environment.outputs.packaging_img_version }} release: ${{ needs.get-environment.outputs.release }} commit_hash: ${{ github.sha }} stability: ${{ needs.get-environment.outputs.stability }} legacy_engine: 'OFF' build_debug_packages: false packages_in_artifact: false - image: centreon-collect-debian-bullseye + image: packaging-centreon-collect-bullseye distrib: bullseye package_extension: deb runner: collect diff --git a/.github/workflows/windows-agent.yml b/.github/workflows/windows-agent.yml index 9240c28aea8..349d84c6441 100644 --- a/.github/workflows/windows-agent.yml +++ b/.github/workflows/windows-agent.yml @@ -1,4 +1,4 @@ -name: Centreon Monitoring Agent Windows build and packaging +name: windows-agent concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}