elements inventory for exordos (#324)

Author: slashburygin

.github/workflows/build.yml

@@ -24,18 +24,18 @@ jobs:
           mkdir -p ${ARTIFACTS_PATH}
 
           source ~/.profile
-          VERSION="$(genesis get-version .)"
+          VERSION="$(exordos get-version .)"
 
           # Build Exordos Core
-          genesis build $(pwd) --inventory
+          exordos build $(pwd) --inventory
 
           # Decode and write the push configuration
-          echo "$PUSH_CFG" | base64 -d > genesis/genesis.push.yaml
-          genesis push -c genesis/genesis.push.yaml -t local -f --latest
+          echo "$PUSH_CFG" | base64 -d > genesis/exordos.push.yaml
+          exordos push -c genesis/exordos.push.yaml -t local -f --latest
 
           # Upload the VM image
-          gzip -k output/exordos-core.raw -c | \
-          curl -X PUT -T - "$REPO_ENDPOINT_PUT/${PROJECT_NAME}/${VERSION}/exordos-core.raw.gz"
+          # gzip -k output/exordos-core.raw -c | \
+          # curl -X PUT -T - "$REPO_ENDPOINT_PUT/${PROJECT_NAME}/${VERSION}/exordos-core.raw.gz"
 
           # Temporary upload step is done in the build script
           echo "${VERSION}" > "${ARTIFACTS_PATH}/version.txt"

.github/workflows/inventory.yml

@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   Build:
-    runs-on: self-hosted
+    runs-on: hard
     strategy:
       fail-fast: true
     steps:

Makefile

@@ -11,7 +11,7 @@ help:
 	@echo "bootstrap        - bootstrap exordos core"
 
 build_core:
-	genesis build -i $(SSH_KEY) -f . --inventory --manifest-var repository=https://repository.genesis-core.tech
+	exordos build -i $(SSH_KEY) -f . --inventory --manifest-var repository=https://repository.genesis-core.tech
 
 bootstrap:
-	genesis bootstrap -i output/inventory.json -f -m core --admin-password admin --cidr 10.20.0.0/22
+	exordos bootstrap -i output/inventory.json -f -m core --admin-password admin --cidr 10.20.0.0/22

exordos_core/cmd/bootstrap.py

@@ -240,7 +240,7 @@ def _ensure_gctl_config(spec: dict[str, tp.Any]):
     gid = grp.getgrnam(USER).gr_gid
     os.chown(GCTL_CFG_DIR, uid, gid)
 
-    config_path = os.path.join(GCTL_CFG_DIR, "genesisctl.yaml")
+    config_path = os.path.join(GCTL_CFG_DIR, "exordosctl.yaml")
     with open(config_path, "w") as f:
         yaml.safe_dump(
             {
@@ -263,7 +263,7 @@ def _ensure_gctl_config(spec: dict[str, tp.Any]):
             f,
         )
     os.chown(config_path, uid, gid)
-    os.system("genesis autocomplete")
+    os.system("exordos autocomplete")
 
 
 def _install_element_manifest(
@@ -284,7 +284,7 @@ def _install_element_manifest(
         return
 
     os.system(
-        f"genesis --config {GCTL_CFG_DIR}/genesisctl.yaml elements install {manifest_path}"
+        f"exordos --config {GCTL_CFG_DIR}/exordosctl.yaml elements install {manifest_path}"
     )
 
 

exordos_core/cmd/elements_inventory.py

@@ -21,7 +21,10 @@
 import time
 
 REPOSITORY_DIR = "/var/lib/repository"
-ELEMENTS_DIR = "genesis-elements"
+ELEMENTS_DIRS = [
+    "genesis-elements",
+    "exordos-elements",
+]
 INVENTORY = "*/inventory.json"
 
 
@@ -67,22 +70,23 @@ def write_merged_inventory(merged_data, output_path):
 
 
 def main():
-    root_dir = os.path.join(REPOSITORY_DIR, ELEMENTS_DIR)
-    output_file = os.path.join(root_dir, "inventory.json")
+    for elements_dir in ELEMENTS_DIRS:
+        root_dir = os.path.join(REPOSITORY_DIR, elements_dir)
+        output_file = os.path.join(root_dir, "inventory.json")
 
-    print("Searching for inventory.json files...")
-    inventory_files = find_inventory_files(root_dir)
+        print("Searching for inventory.json files...")
+        inventory_files = find_inventory_files(root_dir)
 
-    if not inventory_files:
-        print("No inventory.json files found.")
-        return
+        if not inventory_files:
+            print("No inventory.json files found.")
+            return
 
-    print(f"Found {len(inventory_files)} inventory.json files.")
+        print(f"Found {len(inventory_files)} inventory.json files.")
 
-    merged_data = merge_inventories(inventory_files)
-    print(f"Merged {len(merged_data['elements'])} items.")
+        merged_data = merge_inventories(inventory_files)
+        print(f"Merged {len(merged_data['elements'])} items.")
 
-    write_merged_inventory(merged_data, output_file)
+        write_merged_inventory(merged_data, output_file)
 
 
 if __name__ == "__main__":