Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): bump collect and gorgone to 24.11 #1833

Merged
merged 9 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
* @centreon/owners-cpp

*.pm @centreon/owners-perl
*.pl @centreon/owners-perl

gorgone/ @centreon/owners-perl
gorgone/docs/ @centreon/owners-doc

.github/** @centreon/owners-pipelines
**/packaging/** @centreon/owners-pipelines
**/selinux/** @centreon/owners-pipelines
packaging/** @centreon/owners-pipelines
selinux/** @centreon/owners-pipelines

tests/** @centreon/owners-robot-e2e

gorgone/ @centreon/owners-perl
gorgone/docs/ @centreon/owners-doc

gorgone/tests/robot/config/ @centreon/owners-perl
*.pm @centreon/owners-perl
*.pl @centreon/owners-perl
2 changes: 1 addition & 1 deletion .github/actions/delivery/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ runs:
echo "[DEBUG] - stability: ${{ inputs.stability }}"

# Make sure all required inputs are NOT empty
if [[ -z "${{ inputs.module_name }}" || -z "${{ inputs.distrib }}" || -z ${{ inputs.stability }} || -z ${{ inputs.major_version }} || -z "${{ inputs.is_cloud }}" || -z "${{ inputs.release_type }}" ]]; then
if [[ -z "${{ inputs.module_name }}" || -z "${{ inputs.distrib }}" || -z ${{ inputs.stability }} || -z ${{ inputs.major_version }} || -z "${{ inputs.is_cloud }}" ]]; then
echo "Some mandatory inputs are empty, please check the logs."
exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/docker/Dockerfile.gorgone-testing-bookworm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ robotframework robotframework-examples robotframework-databaselibrary \
pymysql robotframework-requests robotframework-jsonlibrary

# can't use \$() method it would be executed before the main script, and lsb_release would not be installed.
lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-standard-24.05-stable/ % main' | tee /etc/apt/sources.list.d/centreon.list
lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-standard-24.11-unstable/ % main' | tee /etc/apt/sources.list.d/centreon.list
lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-plugins-stable/ % main' | tee /etc/apt/sources.list.d/centreon-plugins.list

wget -O- https://apt-key.centreon.com | gpg --dearmor | tee /etc/apt/trusted.gpg.d/centreon.gpg > /dev/null 2>&1
Expand Down
2 changes: 1 addition & 1 deletion .github/docker/Dockerfile.gorgone-testing-bullseye
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
pip3 install robotframework robotframework-examples robotframework-databaselibrary \
pymysql robotframework-requests robotframework-jsonlibrary

lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-standard-24.05-stable/ % main' | tee /etc/apt/sources.list.d/centreon.list
lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-standard-24.11-unstable/ % main' | tee /etc/apt/sources.list.d/centreon.list
lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-plugins-stable/ % main' | tee /etc/apt/sources.list.d/centreon-plugins.list

wget -O- https://apt-key.centreon.com | gpg --dearmor | tee /etc/apt/trusted.gpg.d/centreon.gpg > /dev/null 2>&1
Expand Down
2 changes: 1 addition & 1 deletion .github/docker/Dockerfile.gorgone-testing-jammy
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN apt-get update && \
ENV LANG=en_US.UTF-8

# Add Centreon repositories and their public key
RUN echo "deb https://packages.centreon.com/ubuntu-standard-24.05-testing/ jammy main" | tee -a /etc/apt/sources.list.d/centreon-testing.list && \
RUN echo "deb https://packages.centreon.com/ubuntu-standard-24.11-unstable/ jammy main" | tee -a /etc/apt/sources.list.d/centreon-testing.list && \
echo "deb https://packages.centreon.com/ubuntu-plugins-testing/ jammy main" | tee -a /etc/apt/sources.list.d/centreon-plugins-testing.list && \
wget -O- https://apt-key.centreon.com | gpg --dearmor | tee /etc/apt/trusted.gpg.d/centreon.gpg > /dev/null 2>&1 && \
apt-get update
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ jobs:
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
# image: centreon-collect-ubuntu-jammy
# tag: ${{ needs.get-environment.outputs.img_version }}
- runner: collect-arm64
dockerfile: centreon-collect-debian-bullseye
image: centreon-collect-debian-bullseye-arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-gorgone-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

strategy:
matrix:
distrib: [alma8, alma9, bookworm, jammy]
distrib: [alma8, alma9, bookworm] # No ubuntu in 24.10, 24.11 or later for now
steps:
- name: Checkout sources
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/gorgone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, bookworm, jammy]
distrib: [el8, el9, bookworm] # No ubuntu in 24.10, 24.11 or later for now
include:
- package_extension: rpm
image: packaging-nfpm-alma8
Expand Down Expand Up @@ -132,12 +132,13 @@ jobs:
stability: ${{ needs.get-environment.outputs.stability }}

test-gorgone:
if: false
needs: [get-environment, package]

strategy:
fail-fast: false
matrix:
distrib: [el8, el9, bookworm, jammy]
distrib: [el8, el9, bookworm] # No ubuntu in 24.10, 24.11 or later for now
include:
- package_extension: rpm
image: gorgone-testing-alma8
Expand Down Expand Up @@ -214,9 +215,11 @@ jobs:
run: |
if [[ "${{ matrix.package_extension }}" == "deb" ]]; then
apt update
apt install -y ./centreon-gorgone*.deb
apt install -y ./centreon-gorgone*${{ steps.parse-distrib.outputs.package_distrib_name }}*
else
dnf install -y ./centreon-gorgone*.rpm
dnf install -y ./centreon-gorgone*${{ steps.parse-distrib.outputs.package_distrib_name }}* ./centreon-gorgone-centreon-config*${{ steps.parse-distrib.outputs.package_distrib_name }}*
# in el8 at least, there is a package for the configuration and a package for the actual code.
# this is not the case for debian, and for now I don't know why it was made any different between the 2 Os.
fi

- name: Create databases
Expand Down Expand Up @@ -293,7 +296,7 @@ jobs:

strategy:
matrix:
distrib: [bookworm, jammy]
distrib: [bookworm] # No ubuntu in 24.10, 24.11 or later for now

steps:
- name: Checkout sources
Expand Down
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
MAJOR=24.10
MAJOR=24.11
MINOR=0
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ endif()

# Version.
set(COLLECT_MAJOR 24)
set(COLLECT_MINOR 10)
set(COLLECT_MINOR 11)
set(COLLECT_PATCH 0)
set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")

Expand Down
6 changes: 2 additions & 4 deletions gorgone/packaging/centreon-gorgone-centreon-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,15 @@ overrides:
rpm:
depends:
- centreon-gorgone = ${VERSION}-${RELEASE}${DIST}
- centreon-common
deb:
depends:
- centreon-gorgone (= ${VERSION}-${RELEASE}${DIST})
- centreon-common
replaces:
- centreon-gorgone (<< 24.10.0)
- centreon-gorgone (<< 24.11.0)

deb:
breaks:
- centreon-gorgone (<< 24.10.0)
- centreon-gorgone (<< 24.11.0)

rpm:
summary: Configure Centreon Gorgone for use with Centreon Web
Expand Down
4 changes: 3 additions & 1 deletion gorgone/packaging/centreon-gorgone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ scripts:
overrides:
rpm:
depends:
- centreon-common
- bzip2
- perl-Libssh-Session >= 0.8
- perl-CryptX
Expand Down Expand Up @@ -193,7 +194,8 @@ overrides:
- perl(lib)
- perl(Safe)
deb:
depends:
depends: # those dependencies are taken from centreon-gorgone/packaging/debian/control
- centreon-common
- libdatetime-perl
- libtime-parsedate-perl
- libtry-tiny-perl
Expand Down
Loading