From 0dc42988307bd4c4f2f292c32ee46dac9839b3d4 Mon Sep 17 00:00:00 2001 From: omercier Date: Thu, 10 Oct 2024 11:52:22 +0200 Subject: [PATCH 1/7] bump(as400): increased as400 connector version for new build --- as400/changelog | 3 +++ as400/connector.as400/pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/as400/changelog b/as400/changelog index 2a8a24566c..e1433dfafb 100644 --- a/as400/changelog +++ b/as400/changelog @@ -1,3 +1,6 @@ +2024-10-10 Olivier Mercier - 2.0.3 + * New build workflow + 2021-12-31 Quentin Garnier - 2.0.1 * Use log4j 2.17.1 diff --git a/as400/connector.as400/pom.xml b/as400/connector.as400/pom.xml index 9b4af16195..60ed98face 100644 --- a/as400/connector.as400/pom.xml +++ b/as400/connector.as400/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.centreon.connector centreon-as400 - 2.0.2 + 2.0.3 Centreon-AS/400 Connecteur AS/400 jar From 863f62191c759ba0f472498d19d361f6c10511b6 Mon Sep 17 00:00:00 2001 From: omercier <32134301+omercier@users.noreply.github.com> Date: Thu, 10 Oct 2024 12:02:56 +0200 Subject: [PATCH 2/7] Update as400.yml --- .github/workflows/as400.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/as400.yml b/.github/workflows/as400.yml index 004ee377da..0d20a6a5c7 100644 --- a/.github/workflows/as400.yml +++ b/.github/workflows/as400.yml @@ -8,13 +8,13 @@ on: workflow_dispatch: pull_request: paths: - - 'as400/packaging/**' + - 'as400/**' push: branches: - develop - master paths: - - 'as400/packaging/**' + - 'as400/**' jobs: get-environment: From 5da53f946113b7a9740b844bd2c8d72685c04b31 Mon Sep 17 00:00:00 2001 From: tuntoja Date: Thu, 10 Oct 2024 12:07:43 +0200 Subject: [PATCH 3/7] use version macro instead of hardcoded version --- as400/packaging/centreon-as400-daemon.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/as400/packaging/centreon-as400-daemon.yaml b/as400/packaging/centreon-as400-daemon.yaml index 2d0c819877..5e2734810b 100644 --- a/as400/packaging/centreon-as400-daemon.yaml +++ b/as400/packaging/centreon-as400-daemon.yaml @@ -14,8 +14,8 @@ homepage: "https://www.centreon.com" license: "Apache-2.0" contents: - - src: "../connector.as400/target/centreon-as400-2.0.2-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE - dst: "/usr/share/centreon-as400/bin/centreon-as400-2.0.2-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE + - src: "../connector.as400/target/centreon-as400-%{version}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE + dst: "/usr/share/centreon-as400/bin/centreon-as400-%{version}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE file_info: mode: 0755 owner: "centreon-as400" From 3609ba0b4d3f40ffe373ee15f583c971d1c2f191 Mon Sep 17 00:00:00 2001 From: tuntoja Date: Thu, 10 Oct 2024 12:21:20 +0200 Subject: [PATCH 4/7] fix version var --- as400/packaging/centreon-as400-daemon.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/as400/packaging/centreon-as400-daemon.yaml b/as400/packaging/centreon-as400-daemon.yaml index 5e2734810b..f88759f7f7 100644 --- a/as400/packaging/centreon-as400-daemon.yaml +++ b/as400/packaging/centreon-as400-daemon.yaml @@ -2,7 +2,7 @@ name: "centreon-plugin-Operatingsystems-AS400-daemon" arch: "${ARCH}" platform: "linux" version_schema: "none" -version: "2.0.2" +version: "%{VERSION}" release: "${RELEASE}${DIST}" section: "default" priority: "optional" @@ -14,8 +14,8 @@ homepage: "https://www.centreon.com" license: "Apache-2.0" contents: - - src: "../connector.as400/target/centreon-as400-%{version}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE - dst: "/usr/share/centreon-as400/bin/centreon-as400-%{version}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE + - src: "../connector.as400/target/centreon-as400-${VERSION}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE + dst: "/usr/share/centreon-as400/bin/centreon-as400-${VERSION}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE file_info: mode: 0755 owner: "centreon-as400" From 98f5b1ca056635bedbe368ee060d6d69b8696c67 Mon Sep 17 00:00:00 2001 From: tuntoja Date: Thu, 10 Oct 2024 12:24:45 +0200 Subject: [PATCH 5/7] fix --- as400/packaging/centreon-as400-daemon.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/as400/packaging/centreon-as400-daemon.yaml b/as400/packaging/centreon-as400-daemon.yaml index f88759f7f7..4df9f4bc1d 100644 --- a/as400/packaging/centreon-as400-daemon.yaml +++ b/as400/packaging/centreon-as400-daemon.yaml @@ -2,7 +2,7 @@ name: "centreon-plugin-Operatingsystems-AS400-daemon" arch: "${ARCH}" platform: "linux" version_schema: "none" -version: "%{VERSION}" +version: "${VERSION}" release: "${RELEASE}${DIST}" section: "default" priority: "optional" From 52f2dffd38eb2b7e7a29bad404cae8e5f0e07dce Mon Sep 17 00:00:00 2001 From: tuntoja Date: Thu, 10 Oct 2024 12:30:05 +0200 Subject: [PATCH 6/7] fix version --- as400/packaging/centreon-as400-daemon.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/as400/packaging/centreon-as400-daemon.yaml b/as400/packaging/centreon-as400-daemon.yaml index 4df9f4bc1d..8c0debc843 100644 --- a/as400/packaging/centreon-as400-daemon.yaml +++ b/as400/packaging/centreon-as400-daemon.yaml @@ -2,7 +2,7 @@ name: "centreon-plugin-Operatingsystems-AS400-daemon" arch: "${ARCH}" platform: "linux" version_schema: "none" -version: "${VERSION}" +version: "2.0.3" release: "${RELEASE}${DIST}" section: "default" priority: "optional" From 8d70f2957de1d174fefbecb2b380987417421e44 Mon Sep 17 00:00:00 2001 From: tuntoja Date: Thu, 10 Oct 2024 13:20:01 +0200 Subject: [PATCH 7/7] fix packaging --- .github/workflows/as400.yml | 2 +- as400/packaging/centreon-as400-daemon.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/as400.yml b/.github/workflows/as400.yml index 0d20a6a5c7..0df6562f89 100644 --- a/.github/workflows/as400.yml +++ b/.github/workflows/as400.yml @@ -89,7 +89,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} version: ${{ needs.get-environment.outputs.version }} - release: ${{ needs.get-environment.outputs.release }} + release: 1 arch: all commit_hash: ${{ github.sha }} cache_key: ${{ github.sha }}-${{ github.run_id }}-${{ matrix.package_extension }}-as400-${{ matrix.distrib }} diff --git a/as400/packaging/centreon-as400-daemon.yaml b/as400/packaging/centreon-as400-daemon.yaml index 8c0debc843..b6b0910443 100644 --- a/as400/packaging/centreon-as400-daemon.yaml +++ b/as400/packaging/centreon-as400-daemon.yaml @@ -16,6 +16,7 @@ license: "Apache-2.0" contents: - src: "../connector.as400/target/centreon-as400-${VERSION}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE dst: "/usr/share/centreon-as400/bin/centreon-as400-${VERSION}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE + expand: true file_info: mode: 0755 owner: "centreon-as400"