fix(ci): move ezxenstore to the rrdd-plugin opam package

ezxenstore wasn't being installed by the specfile, but a new dependency was added between the RRDD plugins and Ezxenstore. We don't want to introduce new publicly installed packages in the specfile, so move ezxenstore to an existing package: the RRDD plugin one. Signed-off-by: Edwin Török <[email protected]>
edwintorok · Oct 2, 2024 · 3a6da86 · 3a6da86
1 parent 802dda6
commit 3a6da86
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 86 deletions.
diff --git a/dune-project b/dune-project
@@ -157,14 +157,18 @@
   (depends
    ocaml
    astring
+   cmdliner
+   logs
    rpclib
+   uuidm
    (rrd-transport (= :version))
    (xapi-forkexecd (= :version))
    (xapi-stdext-pervasives (= :version))
    (xapi-stdext-std (= :version))
    (xapi-stdext-threads (= :version))
    (xapi-stdext-unix (= :version))
    (xapi-idl (= :version))
+   xenctrl
    xenstore
    xenstore_transport
   )
@@ -296,6 +300,7 @@
     result
     rpclib
     rresult
+    uuidm
     uri
     xenctrl
     xmlm
@@ -333,7 +338,6 @@
     ctypes
     ctypes-foreign
     domain-name
-    (ezxenstore (= :version))
     fmt
     fd-send-recv
     hex
@@ -416,7 +420,6 @@
     cohttp-lwt
     conf-libssl
     (cstruct (>= "3.0.0"))
-    (ezxenstore (= :version))
     (forkexec (= :version))
     io-page
     lwt
@@ -624,10 +627,6 @@ This package provides an Lwt compatible interface to the library.")
   )
 )
 
-(package
-  (name ezxenstore)
-)
-
 (package
   (name cohttp-posix)
 )

diff --git a/ezxenstore.opam b/ezxenstore.opam
diff --git a/ezxenstore.opam.template b/ezxenstore.opam.template
diff --git a/ocaml/libs/ezxenstore/core/dune b/ocaml/libs/ezxenstore/core/dune
@@ -1,6 +1,6 @@
 (library
   (name ezxenstore_core)
-  (public_name ezxenstore.core)
+  (public_name rrdd-plugin.ezxenstore.core)
   (libraries
     cmdliner
     logs

diff --git a/ocaml/libs/ezxenstore/lib/dune b/ocaml/libs/ezxenstore/lib/dune
@@ -1,9 +1,8 @@
 (library
   (name ezxenstore)
-  (public_name ezxenstore)
   (wrapped false)
   (libraries
-    (re_export ezxenstore_core)
+    (re_export rrdd-plugin.ezxenstore.core)
     (re_export ezxenstore_watch)
   )
 )
diff --git a/ocaml/libs/ezxenstore/lib_test/dune b/ocaml/libs/ezxenstore/lib_test/dune
@@ -1,6 +1,6 @@
 (test
   (name main)
-  (package ezxenstore)
+  (package rrdd-plugin)
   (deps main.exe)
   (libraries cmdliner ezxenstore xenstore_transport xenstore xenstore.unix)
 )
diff --git a/ocaml/libs/ezxenstore/watch/dune b/ocaml/libs/ezxenstore/watch/dune
@@ -1,9 +1,8 @@
 (library
   (name ezxenstore_watch)
-  (public_name ezxenstore.watch)
   (wrapped false)
   (libraries
-    ezxenstore_core
+    rrdd-plugin.ezxenstore.core
     xenctrl
     uuidm
     threads.posix

diff --git a/ocaml/quicktest/dune b/ocaml/quicktest/dune
@@ -7,7 +7,7 @@
     alcotest
     astring
     ezxenstore
-    ezxenstore.watch
+    ezxenstore_watch
     fmt
     forkexec
     http_lib

diff --git a/ocaml/xapi/dune b/ocaml/xapi/dune
@@ -109,7 +109,7 @@
     cohttp
     cohttp_posix
     domain-name
-    ezxenstore.core
+    rrdd-plugin.ezxenstore.core
     fmt
     forkexec
     gencertlib

diff --git a/ocaml/xcp-rrdd/bin/rrdd/dune b/ocaml/xcp-rrdd/bin/rrdd/dune
@@ -42,8 +42,8 @@
   (libraries
     astring
 
-    ezxenstore.core
-    ezxenstore.watch
+    rrdd-plugin.ezxenstore.core
+    ezxenstore_watch
     forkexec
     http_lib
     httpsvr

diff --git a/ocaml/xcp-rrdd/bin/rrdp-iostat/dune b/ocaml/xcp-rrdd/bin/rrdp-iostat/dune
@@ -5,7 +5,7 @@
     astring
     cstruct
 
-    ezxenstore.core
+    rrdd-plugin.ezxenstore.core
     inotify
     mtime
     mtime.clock.os

diff --git a/ocaml/xcp-rrdd/bin/rrdp-squeezed/dune b/ocaml/xcp-rrdd/bin/rrdp-squeezed/dune
@@ -7,7 +7,7 @@
     rrdd_plugins_libs
     xapi-stdext-std
     ezxenstore
-    ezxenstore.watch
+    ezxenstore_watch
     xapi-idl.rrd
     xapi-log
     xapi-rrd

diff --git a/ocaml/xcp-rrdd/lib/plugin/dune b/ocaml/xcp-rrdd/lib/plugin/dune
@@ -31,7 +31,7 @@
   (libraries
     astring
     xenctrl
-    ezxenstore.core
+    rrdd-plugin.ezxenstore.core
     uuid
     xapi-log
     threads.posix

diff --git a/ocaml/xenopsd/list_domains/dune b/ocaml/xenopsd/list_domains/dune
@@ -2,5 +2,5 @@
   (name list_domains)
   (public_name list_domains)
   (package xapi-tools)
-  (libraries  xenctrl xapi-idl.memory ezxenstore.watch uuid)
+  (libraries  xenctrl xapi-idl.memory ezxenstore_watch uuid)
 )
diff --git a/ocaml/xenopsd/pvs/dune b/ocaml/xenopsd/pvs/dune
@@ -1,6 +1,6 @@
 (executable
  (name pvs_proxy_setup)
- (libraries ezxenstore.core bos xapi-consts.xapi_version xapi-idl cmdliner log rresult)
+ (libraries rrdd-plugin.ezxenstore.core bos xapi-consts.xapi_version xapi-idl cmdliner log rresult)
 )
 
 (install

diff --git a/ocaml/xenopsd/xc/dune b/ocaml/xenopsd/xc/dune
@@ -11,8 +11,8 @@
   astring
   base64
   cpuid
-  ezxenstore.core
-  ezxenstore.watch
+  rrdd-plugin.ezxenstore.core
+  ezxenstore_watch
   fd-send-recv
   fmt
   forkexec
@@ -73,7 +73,7 @@
 
  (libraries
 
-  ezxenstore.core
+  rrdd-plugin.ezxenstore.core
   uuid
   xapi-idl
   xapi-idl.xen.interface
@@ -94,7 +94,7 @@
   astring
   cmdliner
 
-  ezxenstore.core
+  rrdd-plugin.ezxenstore.core
   uuid
   xapi-idl.memory
   xapi-stdext-date
@@ -142,7 +142,7 @@
  (libraries
   cmdliner
 
-  ezxenstore.core
+  rrdd-plugin.ezxenstore.core
   threads.posix
   xapi-idl.xen.interface
   xapi_xenopsd

diff --git a/rrdd-plugin.opam b/rrdd-plugin.opam
@@ -12,14 +12,18 @@ depends: [
   "dune" {>= "3.15"}
   "ocaml"
   "astring"
+  "cmdliner"
+  "logs"
   "rpclib"
+  "uuidm"
   "rrd-transport" {= version}
   "xapi-forkexecd" {= version}
   "xapi-stdext-pervasives" {= version}
   "xapi-stdext-std" {= version}
   "xapi-stdext-threads" {= version}
   "xapi-stdext-unix" {= version}
   "xapi-idl" {= version}
+  "xenctrl"
   "xenstore"
   "xenstore_transport"
   "odoc" {with-doc}

diff --git a/vhd-tool.opam b/vhd-tool.opam
@@ -17,7 +17,6 @@ depends: [
   "cohttp-lwt"
   "conf-libssl"
   "cstruct" {>= "3.0.0"}
-  "ezxenstore" {= version}
   "forkexec" {= version}
   "io-page"
   "lwt"

diff --git a/xapi-tools.opam b/xapi-tools.opam
@@ -23,6 +23,7 @@ depends: [
   "result"
   "rpclib"
   "rresult"
+  "uuidm"
   "uri"
   "xenctrl"
   "xmlm"

diff --git a/xapi.opam b/xapi.opam
@@ -25,7 +25,6 @@ depends: [
   "ctypes"
   "ctypes-foreign"
   "domain-name"
-  "ezxenstore" {= version}
   "fmt"
   "fd-send-recv"
   "hex"
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
         astring
         cstruct
-        ezxenstore.core
+        rrdd-plugin.ezxenstore.core
         inotify
         mtime
         mtime.clock.os
@@ Expand Down @@