Skip to content

Commit

Permalink
Refactor non free depency packaging
Browse files Browse the repository at this point in the history
Change-Id: I1ac4b845d94921589a0c5d26ab3d8ec12e31cb2a
  • Loading branch information
Alex Zurhake committed Jan 23, 2025
1 parent da8d40a commit 187b0e0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 27 deletions.
23 changes: 0 additions & 23 deletions bazel_variables.bzl
Original file line number Diff line number Diff line change
@@ -1,24 +1 @@
UPSTREAM_MIRROR_URL = "https://artifacts.lan.tribe29.com/repository/upstream-archives/"

edition_deps = {
"cre": [],
"cce": [
"//non-free/packages/cmk-mknotifyd:cmk_mknotifyd_pkg",
"//non-free/packages/cmc-protocols:pkg_tar",
"//non-free/packages/cmk-otel-collector:pkg_tar",
],
"cee": [
"//non-free/packages/cmk-mknotifyd:cmk_mknotifyd_pkg",
"//non-free/packages/cmc-protocols:pkg_tar",
],
"cme": [
"//non-free/packages/cmk-mknotifyd:cmk_mknotifyd_pkg",
"//non-free/packages/cmc-protocols:pkg_tar",
"//non-free/packages/cmk-otel-collector:pkg_tar",
],
"cse": [
"//non-free/packages/cmk-mknotifyd:cmk_mknotifyd_pkg",
"//non-free/packages/cmc-protocols:pkg_tar",
"//non-free/packages/cmk-otel-collector:pkg_tar",
],
}
4 changes: 2 additions & 2 deletions cmk/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ load("@aspect_rules_py//py:defs.bzl", "py_library", "py_pytest_main")
load("@cmk_requirements//:requirements.bzl", "requirement")
load("@com_google_protobuf//:protobuf_version.bzl", "PROTOBUF_PYTHON_VERSION")
load("@rules_python//python:packaging.bzl", "py_wheel")
load("//:bazel_variables.bzl", "edition_deps")
load("//bazel/rules:doctest.bzl", "py_doc_test")

genrule(
Expand Down Expand Up @@ -205,7 +204,8 @@ py_library(
# TODO: Shouldn't we add "cycletime_" and "state_" here?
"//non-free/packages/cmc-protocols:config_proto_pb2",
"lib_cmk",
] + edition_deps[edition],
"//non-free/packages:non-free_" + edition,
],
) for edition, srcs in [
("cce", CCE_PY),
("cee", CEE_PY),
Expand Down
4 changes: 2 additions & 2 deletions omd/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ load("@bazel_skylib//rules:write_file.bzl", "write_file")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
load("@rules_uv//uv:pip.bzl", "pip_compile")
load("@rules_uv//uv:venv.bzl", "create_venv")
load("//:bazel_variables.bzl", "edition_deps")

exports_files([
"requirements.txt",
Expand Down Expand Up @@ -55,7 +54,8 @@ create_venv(
"//packages/cmk-server-side-calls:pkg_tar",
"//packages/cmk-trace:pkg_tar",
"//packages/cmk-werks:pkg_tar",
] + edition_deps[edition],
"//non-free/packages:non-free_" + edition,
],
) for edition in [
"cre",
"cce",
Expand Down

0 comments on commit 187b0e0

Please sign in to comment.