From a7a6495ea102b77e66ceb14fd6f1d5ebefb2007e Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Mon, 25 Mar 2024 10:38:28 +0100 Subject: [PATCH] packages: add ubuntu packages --- .gitlab/ci/jobs/build/oc.build:dpkg:amd64-manual.yml | 1 + .gitlab/ci/jobs/build/oc.build:dpkg:amd64.yml | 1 + .gitlab/ci/pipelines/non_release_tag.yml | 1 + .gitlab/ci/pipelines/non_release_tag_test.yml | 1 + .gitlab/ci/pipelines/octez_beta_release_tag.yml | 1 + .gitlab/ci/pipelines/octez_release_tag.yml | 1 + .gitlab/ci/pipelines/octez_release_tag_test.yml | 1 + ci/bin/common.ml | 2 +- scripts/ci/create_gitlab_package.sh | 7 +++++++ scripts/ci/create_gitlab_release.sh | 2 ++ scripts/ci/octez-release.sh | 2 ++ 11 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/jobs/build/oc.build:dpkg:amd64-manual.yml b/.gitlab/ci/jobs/build/oc.build:dpkg:amd64-manual.yml index a36c3f68363b..4789cc8c9246 100644 --- a/.gitlab/ci/jobs/build/oc.build:dpkg:amd64-manual.yml +++ b/.gitlab/ci/jobs/build/oc.build:dpkg:amd64-manual.yml @@ -45,3 +45,4 @@ oc.build:dpkg:amd64: matrix: - DISTRIBUTION: - debian:bookworm + - ubuntu:focal diff --git a/.gitlab/ci/jobs/build/oc.build:dpkg:amd64.yml b/.gitlab/ci/jobs/build/oc.build:dpkg:amd64.yml index 4589d82071e9..11a24418e412 100644 --- a/.gitlab/ci/jobs/build/oc.build:dpkg:amd64.yml +++ b/.gitlab/ci/jobs/build/oc.build:dpkg:amd64.yml @@ -42,3 +42,4 @@ oc.build:dpkg:amd64: matrix: - DISTRIBUTION: - debian:bookworm + - ubuntu:focal diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index ed91ca1b4410..3f54021a63a8 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -120,6 +120,7 @@ oc.build:dpkg:amd64: matrix: - DISTRIBUTION: - debian:bookworm + - ubuntu:focal oc.build:rpm:amd64: image: fedora:39 diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index cdf971852cda..7db85d27bc7d 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -120,6 +120,7 @@ oc.build:dpkg:amd64: matrix: - DISTRIBUTION: - debian:bookworm + - ubuntu:focal oc.build:rpm:amd64: image: fedora:39 diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index cc376f0356a8..298f5e446da8 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -120,6 +120,7 @@ oc.build:dpkg:amd64: matrix: - DISTRIBUTION: - debian:bookworm + - ubuntu:focal oc.build:rpm:amd64: image: fedora:39 diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index a95837345d17..0a41b7c2b1d1 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -120,6 +120,7 @@ oc.build:dpkg:amd64: matrix: - DISTRIBUTION: - debian:bookworm + - ubuntu:focal oc.build:rpm:amd64: image: fedora:39 diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 70df6609a318..9fb1e52572c6 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -120,6 +120,7 @@ oc.build:dpkg:amd64: matrix: - DISTRIBUTION: - debian:bookworm + - ubuntu:focal oc.build:rpm:amd64: image: fedora:39 diff --git a/ci/bin/common.ml b/ci/bin/common.ml index fca6ff54c1e2..8cd7c42d3b92 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -627,7 +627,7 @@ let job_build_bin_package ?rules ~__POS__ ~name ?(stage = Stages.build) ~arch let parallel = let distributions = match target with - | Dpkg -> ["debian:bookworm"] + | Dpkg -> ["debian:bookworm"; "ubuntu:focal"] | Rpm -> ["fedora:39"; "rockylinux:9.3"] in Matrix [[("DISTRIBUTION", distributions)]] diff --git a/scripts/ci/create_gitlab_package.sh b/scripts/ci/create_gitlab_package.sh index 04ea72547e7f..9558c8b3a411 100755 --- a/scripts/ci/create_gitlab_package.sh +++ b/scripts/ci/create_gitlab_package.sh @@ -15,6 +15,7 @@ set -eu # :gitlab_api_url/projects/:id/packages/generic/:package_name/:package_version/:file_name gitlab_octez_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_binaries_package_name}/${gitlab_package_version}" gitlab_octez_debian_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_debian_package_name}/${gitlab_package_version}" +gitlab_octez_ubuntu_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_ubuntu_package_name}/${gitlab_package_version}" gitlab_octez_fedora_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_fedora_package_name}/${gitlab_package_version}" gitlab_octez_rockylinux_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_rockylinux_package_name}/${gitlab_package_version}" gitlab_octez_source_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_source_package_name}/${gitlab_package_version}" @@ -77,6 +78,12 @@ for package in ${debian_packages}; do gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_debian_package_url}" done +echo "Upload Ubuntu packages" +for package in ${ubuntu_packages}; do + package_name="$(basename "${package}")" + gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_ubuntu_package_url}" +done + echo "Upload Fedora packages" for package in ${fedora_packages}; do package_name="$(basename "${package}")" diff --git a/scripts/ci/create_gitlab_release.sh b/scripts/ci/create_gitlab_release.sh index a169f58620dc..99978fd6c948 100755 --- a/scripts/ci/create_gitlab_release.sh +++ b/scripts/ci/create_gitlab_release.sh @@ -32,6 +32,7 @@ package_web_path() { gitlab_binaries_url=$(package_web_path "${gitlab_octez_binaries_package_name}") gitlab_octez_source_url=$(package_web_path "${gitlab_octez_source_package_name}") gitlab_debian_packages_url=$(package_web_path "${gitlab_octez_debian_package_name}") +gitlab_ubuntu_packages_url=$(package_web_path "${gitlab_octez_ubuntu_package_name}") gitlab_fedora_packages_url=$(package_web_path "${gitlab_octez_fedora_package_name}") gitlab_rockylinux_packages_url=$(package_web_path "${gitlab_octez_rockylinux_package_name}") @@ -74,5 +75,6 @@ release-cli create \ --assets-link="{\"name\":\"Static binaries\",\"url\":\"${gitlab_binaries_url}\",\"link_type\":\"package\"}" \ --assets-link="{\"name\":\"Octez source\",\"url\":\"${gitlab_octez_source_url}\",\"link_type\":\"other\"}" \ --assets-link="{\"name\":\"Debian packages\",\"url\":\"${gitlab_debian_packages_url}\",\"link_type\":\"package\"}" \ + --assets-link="{\"name\":\"Ubuntu packages\",\"url\":\"${gitlab_ubuntu_packages_url}\",\"link_type\":\"package\"}" \ --assets-link="{\"name\":\"Fedora packages\",\"url\":\"${gitlab_fedora_packages_url}\",\"link_type\":\"package\"}" \ --assets-link="{\"name\":\"Rocky Linux packages\",\"url\":\"${gitlab_rockylinux_packages_url}\",\"link_type\":\"package\"}" diff --git a/scripts/ci/octez-release.sh b/scripts/ci/octez-release.sh index 7a17d906f4d9..dad5f3412e00 100755 --- a/scripts/ci/octez-release.sh +++ b/scripts/ci/octez-release.sh @@ -14,6 +14,7 @@ binaries="$(cat "$script_inputs_dir/released-executables")" # these variables are used in the script scripts/ci/create_gitlab_package.sh debian_packages="$(find debian:bookworm/ -maxdepth 1 -name octez-\*.deb)" +ubuntu_packages="$(find ubuntu:focal/ -maxdepth 1 -name octez-\*.deb)" fedora_packages="$(find fedora:39/ -maxdepth 1 -name octez-\*.rpm)" rockylinux_packages="$(find rockylinux:9.3/ -maxdepth 1 -name octez-\*.rpm)" @@ -56,6 +57,7 @@ fi gitlab_octez_binaries_package_name="octez-binaries-${gitlab_release_no_v}" gitlab_octez_debian_package_name="octez-debian-${gitlab_release_no_v}" +gitlab_octez_ubuntu_package_name="octez-ubuntu-${gitlab_release_no_v}" gitlab_octez_fedora_package_name="octez-fedora-${gitlab_release_no_v}" gitlab_octez_rockylinux_package_name="octez-rockylinux-${gitlab_release_no_v}" gitlab_octez_source_package_name="octez-source-${gitlab_release_no_v}" -- GitLab