commit 403c0428046dadfb7dc44c958c943fa0d7666c98
author Mohammed Naser <mnaser@vexxhost.com> Tue Jan 16 14:36:28 2024 -0500
committer GitHub <noreply@github.com> Tue Jan 16 14:36:28 2024 -0500
tree 1a9d910f89aa87069170ca0606ebf389bedda0b7
parent 4b3587b24c0395d4dd7b4c57975022f153bc6565

feat: upgrade to bobcat (#887)

images/cinder/Earthfile

diff --git a/images/cinder/Earthfile b/images/cinder/Earthfile
index c02de0c..402127f 100644
--- a/images/cinder/Earthfile
+++ b/images/cinder/Earthfile
@@ -1,19 +1,22 @@
 VERSION 0.7
 
+ARG --global PROJECT=cinder
+ARG --global RELEASE=2023.2
+ARG --global PROJECT_REF=7d158234b72f04e780e307b0375cedf30dd8fb90
+
+build:
+  FROM ../openstack-service+builder --RELEASE=${RELEASE}
+  DO ../openstack-service+BUILD_VENV \
+    --PROJECT=${PROJECT} \
+    --PROJECT_REF=${PROJECT_REF} \
+    --PIP_PACKAGES="purestorage"
+
 image:
-  ARG PROJECT=cinder
-  ARG RELEASE=zed
-  ARG REF=011e6549259c0433ceb594d8083f6c838d964311
-  FROM ../openstack-service+image \
-    --PROJECT ${PROJECT} \
-    --RELEASE ${RELEASE} \
-    --PROJECT_REF ${REF} \
-    --PIP_PACKAGES "purestorage"
-  DO \
-    ../+APT_INSTALL \
-    --PACKAGES "ceph-common lsscsi nvme-cli python3-rados python3-rbd qemu-utils sysfsutils udev util-linux"
-  DO ../+APPLY_PATCHES
+  FROM ../openstack-service+image --RELEASE ${RELEASE} --PROJECT ${PROJECT}
+  COPY +build/venv /var/lib/openstack
   COPY ../kubernetes+image/kubectl /usr/local/bin/kubectl
+  DO ../+APT_INSTALL \
+    --PACKAGES "ceph-common lsscsi nvme-cli python3-rados python3-rbd qemu-utils sysfsutils udev util-linux"
   SAVE IMAGE --push \
     ghcr.io/vexxhost/atmosphere/${PROJECT}:${RELEASE} \
-    ghcr.io/vexxhost/atmosphere/${PROJECT}:${REF}
+    ghcr.io/vexxhost/atmosphere/${PROJECT}:${PROJECT_REF}