Skip to content

Commit

Permalink
chore(ci): move to harbor docker registry (22.10) (#581)
Browse files Browse the repository at this point in the history
  • Loading branch information
kduret committed Feb 23, 2023
1 parent 6cbe209 commit abc80e8
Show file tree
Hide file tree
Showing 25 changed files with 77 additions and 383 deletions.
19 changes: 11 additions & 8 deletions .github/actions/package-sign/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ inputs:
centreon_pat:
description: "Secret"
required: false
username:
description: The artifactory username
registry_url:
description: Docker registry url
required: true
password:
description: The artifactory password
registry_username:
description: Docker registry username
required: true
registry_password:
description: Docker registry password
required: true
params:
description: "params for script"
Expand All @@ -28,9 +31,9 @@ runs:
- name: Login to Registry
uses: docker/login-action@v2
with:
registry: docker.centreon.com
username: ${{ inputs.username }}
password: ${{ inputs.password }}
registry: ${{ inputs.registry_url }}
username: ${{ inputs.registry_username }}
password: ${{ inputs.registry_password }}

- run: docker run -i -e TOKEN=${{ inputs.centreon_pat }} --entrypoint /src/.github/scripts/${{ inputs.script_name }}.sh -v "$PWD:/src" docker.centreon.com/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }}
- run: docker run -i -e TOKEN=${{ inputs.centreon_pat }} --entrypoint /src/.github/scripts/${{ inputs.script_name }}.sh -v "$PWD:/src" ${{ inputs.registry_url }}/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }}
shell: bash
8 changes: 4 additions & 4 deletions .github/actions/runner-docker/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: "runner docker Centreon"
description: "runner docker Centreon"
inputs:
registry_url:
description: Docker registry url
required: true
script_name:
description: "script name"
required: true
Expand All @@ -17,11 +20,8 @@ inputs:
description: "params for script"
required: false

env:
REGISTRY: docker.centreon.com

runs:
using: "composite"
steps:
- run: docker run -i --entrypoint ${{ inputs.script_name }}.sh -v "$PWD:/src" ${{ inputs.env_variable }} ${{ env.REGISTRY }}/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }}
- 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
45 changes: 25 additions & 20 deletions .github/workflows/centreon-collect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ on:
pull_request:
push:
branches:
- dev-22.04.x

env:
REGISTRY: docker.centreon.com

- develop
- dev-[2-9][0-9].[0-9][0-9].x
- master
- "[2-9][0-9].[0-9][0-9].x"

jobs:
create-version:
Expand Down Expand Up @@ -62,22 +61,24 @@ jobs:

strategy:
matrix:
include:
- image: centos7
- image: alma8
- image: debian-bullseye
image: [centos7, alma8, debian-bullseye]
name: unit test ${{ matrix.image }}

steps:
- name: Checkout sources
uses: actions/checkout@v3

- name: Login to Registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.REPOS_USERNAME }}
password: ${{ secrets.REPOS_PASSWORD }}
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/ci/scripts/collect-unit-tests
image_name: centreon-collect-${{ matrix.image }}
image_version: ${{ env.imgversion }}
Expand All @@ -100,16 +101,18 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v3

- name: Login to Registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.REPOS_USERNAME }}
password: ${{ secrets.REPOS_PASSWORD }}
registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
username: ${{ secrets.DOCKER_REGISTRY_ID }}
password: ${{ secrets.DOCKER_REGISTRY_PASSWD }}

- name: make rpm ${{ matrix.image }}
uses: ./.github/actions/runner-docker
with:
registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
script_name: /src/ci/scripts/collect-rpm-package
image_name: centreon-collect-${{ matrix.image }}
image_version: ${{ env.imgversion }}
Expand All @@ -121,8 +124,9 @@ jobs:
script_name: rpm-signing
image_name: rpm-signing
image_version: ubuntu
username: ${{ secrets.REPOS_USERNAME }}
password: ${{ secrets.REPOS_PASSWORD }}
registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
registry_username: ${{ secrets.DOCKER_REGISTRY_ID }}
registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWD }}

- name: Use cache RPM files
uses: actions/cache@v3
Expand Down Expand Up @@ -165,13 +169,14 @@ jobs:
- name: Login to Registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.REPOS_USERNAME }}
password: ${{ secrets.REPOS_PASSWORD }}
registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
username: ${{ secrets.DOCKER_REGISTRY_ID }}
password: ${{ secrets.DOCKER_REGISTRY_PASSWD }}

- name: debmake ${{ matrix.image }}
uses: ./centreon-collect/.github/actions/runner-docker
with:
registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
script_name: /src/centreon-collect/ci/scripts/collect-deb-package
image_name: centreon-collect-${{ matrix.image }}
image_version: ${{ env.imgversion }}
Expand Down
35 changes: 16 additions & 19 deletions .github/workflows/docker-builder.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
name: Centreon collect build docker

on:
pull_request_target:
types:
- closed
push:
branches:
- develop
- dev-[2-9][0-9].[0-9][0-9].x
paths:
- 'ci/docker/**'
workflow_dispatch:
pull_request:
paths:
- 'ci/docker/**'

env:
REGISTRY: docker.centreon.com

jobs:
create-version:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -43,27 +39,28 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [centos7, alma8, debian-bullseye]
include:
- project: collect
distrib: centos7
- project: collect
distrib: alma8
- project: collect
distrib: debian-bullseye

steps:
- name: Checkout sources
uses: actions/checkout@v3

- name: Login to Registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.REPOS_USERNAME }}
password: ${{ secrets.REPOS_PASSWORD }}

- name: build docker ${{ matrix.distrib }}
run: docker build --no-cache . -f ci/docker/Dockerfile.${{ matrix.project }}-${{ matrix.distrib }} -t $REGISTRY/centreon-${{ matrix.project }}-${{ matrix.distrib }}:${{ env.imgversion }}
registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
username: ${{ secrets.DOCKER_REGISTRY_ID }}
password: ${{ secrets.DOCKER_REGISTRY_PASSWD }}

- name: push docker ${{ matrix.distrib }}
run: docker push $REGISTRY/centreon-${{ matrix.project }}-${{ matrix.distrib }}:${{ env.imgversion }}
- uses: docker/setup-buildx-action@v2

- uses: docker/build-push-action@v3
with:
file: ci/docker/Dockerfile.${{ matrix.project }}-${{ matrix.distrib }}
context: .
build-args: "REGISTRY_URL=${{ vars.DOCKER_PROXY_REGISTRY_URL }}"
pull: true
push: true
tags: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/centreon-${{ matrix.project }}-${{ matrix.distrib }}:${{ env.imgversion }}
10 changes: 4 additions & 6 deletions .github/workflows/robot-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ on:
schedule:
- cron: '0 0 * * *'

env:
REGISTRY: docker.centreon.com

jobs:
robot-test:
runs-on: [self-hosted, collect]
Expand Down Expand Up @@ -63,13 +60,14 @@ jobs:
- name: Login to Registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.REPOS_USERNAME }}
password: ${{ secrets.REPOS_PASSWORD }}
registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
username: ${{ secrets.DOCKER_REGISTRY_ID }}
password: ${{ secrets.DOCKER_REGISTRY_PASSWD }}

- name: Tests robot (Centos7, Alma8)
uses: ./.github/actions/runner-docker
with:
registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}
script_name: /src/ci/scripts/collect-test-robot
image_name: ${{ matrix.image }}
image_version: ${{ env.imgversion }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ apt install conan
If it does not work, conan can be installed with pip3:

```shell
pip3 install conan
pip3 install conan==1.57.0
```

> All the dependencies pulled by conan are located in conanfile.txt. If
Expand Down
6 changes: 0 additions & 6 deletions ci/debian-gorgone/centreon-gorgone.dirs

This file was deleted.

12 changes: 0 additions & 12 deletions ci/debian-gorgone/centreon-gorgone.install

This file was deleted.

10 changes: 0 additions & 10 deletions ci/debian-gorgone/centreon-gorgone.logrotate

This file was deleted.

67 changes: 0 additions & 67 deletions ci/debian-gorgone/centreon-gorgone.postinst

This file was deleted.

6 changes: 0 additions & 6 deletions ci/debian-gorgone/extra/gorgoned

This file was deleted.

33 changes: 0 additions & 33 deletions ci/debian-gorgone/extra/gorgoned.service

This file was deleted.

Loading

0 comments on commit abc80e8

Please sign in to comment.