Fix bzlmod e2e tests

The new bzlmod configuration in the @bazeldnf repo conflicts with the RPM repositories created in the e2e tests so they need to be renamed.
rmohr · Feb 5, 2025 · 340048b · 340048b
1 parent 7731a8e
commit 340048b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/e2e/bazel-bzlmod-toolchain-from-source/BUILD.bazel b/e2e/bazel-bzlmod-toolchain-from-source/BUILD.bazel
@@ -8,8 +8,8 @@ bazeldnf(
 rpmtree(
     name = "something",
     rpms = [
-        "@libvirt-libs-11.0.0-1.fc42.x86_64.rpm//rpm",
-        "@libvirt-devel-11.0.0-1.fc42.x86_64.rpm//rpm",
+        "@bzlmod_libvirt-libs-11.0.0-1.fc42.x86_64.rpm//rpm",
+        "@bzlmod_libvirt-devel-11.0.0-1.fc42.x86_64.rpm//rpm",
     ],
 )
 

diff --git a/e2e/bazel-bzlmod-toolchain-from-source/MODULE.bazel b/e2e/bazel-bzlmod-toolchain-from-source/MODULE.bazel
@@ -30,21 +30,21 @@ use_repo(
 bazeldnf = use_extension("@bazeldnf//bazeldnf:extensions.bzl", "bazeldnf")
 bazeldnf.toolchain(disable = True)
 bazeldnf.rpm(
-    name = "libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
+    name = "bzlmod_libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
     sha256 = "aac272a2ace134b5ef60a41e6624deb24331e79c76699ef6cef0dca22d94ac7e",
     urls = [
         "https://kojipkgs.fedoraproject.org//packages/libvirt/11.0.0/1.fc42/x86_64/libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
     ],
 )
 bazeldnf.rpm(
-    name = "libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
+    name = "bzlmod_libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
     sha256 = "dba37bbe57903afe49b5666f1781eb50001baa81af4584b355db0b6a2afad9fa",
     urls = [
         "https://kojipkgs.fedoraproject.org//packages/libvirt/11.0.0/1.fc42/x86_64/libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
     ],
 )
 use_repo(
     bazeldnf,
-    "libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
-    "libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
+    "bzlmod_libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
+    "bzlmod_libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
 )
diff --git a/e2e/bazel-bzlmod/BUILD.bazel b/e2e/bazel-bzlmod/BUILD.bazel
@@ -8,8 +8,8 @@ bazeldnf(
 rpmtree(
     name = "something",
     rpms = [
-        "@libvirt-libs-11.0.0-1.fc42.x86_64.rpm//rpm",
-        "@libvirt-devel-11.0.0-1.fc42.x86_64.rpm//rpm",
+        "@bzlmod_libvirt-libs-11.0.0-1.fc42.x86_64.rpm//rpm",
+        "@bzlmod_libvirt-devel-11.0.0-1.fc42.x86_64.rpm//rpm",
     ],
 )
 

diff --git a/e2e/bazel-bzlmod/MODULE.bazel b/e2e/bazel-bzlmod/MODULE.bazel
@@ -12,14 +12,14 @@ bazel_dep(name = "rules_pkg", version = "1.0.1")
 
 bazeldnf = use_extension("@bazeldnf//bazeldnf:extensions.bzl", "bazeldnf")
 bazeldnf.rpm(
-    name = "libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
+    name = "bzlmod_libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
     sha256 = "aac272a2ace134b5ef60a41e6624deb24331e79c76699ef6cef0dca22d94ac7e",
     urls = [
         "https://kojipkgs.fedoraproject.org//packages/libvirt/11.0.0/1.fc42/x86_64/libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
     ],
 )
 bazeldnf.rpm(
-    name = "libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
+    name = "bzlmod_libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
     sha256 = "dba37bbe57903afe49b5666f1781eb50001baa81af4584b355db0b6a2afad9fa",
     urls = [
         "https://kojipkgs.fedoraproject.org//packages/libvirt/11.0.0/1.fc42/x86_64/libvirt-devel-11.0.0-1.fc42.x86_64.rpm",