Split the Mandrel and S2i builds to avoid disk space issues.

quarkusio · Oct 16, 2023 · 4489f12 · 4489f12
1 parent 3cb3f65
commit 4489f12
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 70 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -22,22 +22,31 @@ jobs:
           - name: "base images"
             modules: "quarkus-distroless-base-image,quarkus-micro-base-image"
             args: ""
-          - name: "s2i images"
-            modules: "quarkus-binary-s2i,quarkus-native-s2i"
+          - name: "s2i binary images"
+            modules: "quarkus-binary-s2i"
             args: ""
-          - name: "mandrel builder images"
+          - name: "s2i native images"
+            modules: "quarkus-native-s2i"
+            args: ""
+          - name: "mandrel builder images (latest)"
             modules: "quarkus-mandrel-builder-image"
             args: ""
-          - name: "graalvm ce builder images"
+          - name: "mandrel builder images (23.0.x)"
+            modules: "quarkus-mandrel-builder-image"
+            args: "-Pmandrel-23.0.x"
+          - name: "mandrel builder images (22.x)"
+            modules: "quarkus-mandrel-builder-image"
+            args: "-Pmandrel-22.x"
+          - name: "graalvm ce builder images (latest)"
             modules: "quarkus-graalvm-builder-image"
             args: ""
-          - name: "graalvm ce builder images 21 and 22.0"
+          - name: "graalvm ce builder images 22.x"
             modules: "quarkus-graalvm-builder-image"
-            args: "-Polder-graalvm"            
+            args: "-Pgraalvm-22.x"
 
     steps:
-    - run: |
-        # Re-claim some disk space
+    - name: Re-claim some disk space
+      run: |
         sudo swapoff -a
         sudo rm -f /swapfile
         sudo apt-get clean

diff --git a/.github/workflows/push-images.yml b/.github/workflows/push-images.yml
@@ -17,21 +17,30 @@ jobs:
           - name: "base images"
             modules: "quarkus-distroless-base-image,quarkus-micro-base-image"
             args: ""
-          - name: "s2i images"
-            modules: "quarkus-binary-s2i,quarkus-native-s2i"
+          - name: "s2i binary images"
+            modules: "quarkus-binary-s2i"
             args: ""
-          - name: "mandrel builder images"
+          - name: "s2i native images"
+            modules: "quarkus-native-s2i"
+            args: ""
+          - name: "mandrel builder images (latest)"
             modules: "quarkus-mandrel-builder-image"
             args: ""
-          - name: "graalvm ce builder images"
+          - name: "mandrel builder images (23.0.x)"
+            modules: "quarkus-mandrel-builder-image"
+            args: "-Pmandrel-23.0.x"
+          - name: "mandrel builder images (22.x)"
+            modules: "quarkus-mandrel-builder-image"
+            args: "-Pmandrel-22.x"
+          - name: "graalvm ce builder images (latest)"
             modules: "quarkus-graalvm-builder-image"
             args: ""
-          - name: "graalvm ce builder images 21 and 22.0"
+          - name: "graalvm ce builder images 22.x"
             modules: "quarkus-graalvm-builder-image"
-            args: "-Polder-graalvm"
+            args: "-Pgraalvm-22.x"
     steps:
-      - run: |
-          # Re-claim some disk space
+      - name: Re-claim some disk space
+        run: |
           sudo swapoff -a
           sudo rm -f /swapfile
           sudo apt-get clean

diff --git a/quarkus-graalvm-builder-image/pom.xml b/quarkus-graalvm-builder-image/pom.xml
@@ -76,7 +76,7 @@
         </profile>
 
         <profile>
-            <id>older-graalvm</id>
+            <id>graalvm-22.x</id>
             <properties>
                 <images.file>${project.basedir}/graalvm-22.yaml</images.file>
             </properties>

diff --git a/quarkus-mandrel-builder-image/mandrel-22.x.yaml b/quarkus-mandrel-builder-image/mandrel-22.x.yaml
@@ -0,0 +1,10 @@
+images:
+
+  - graalvm-version: 22.3.3.1-Final
+    java-version: 17
+    tag: 22.3-java17
+    variants:
+      - sha: 8449acd4426dd0b4bc278b167d2a9e729695d45ba0c75a65e6a894ce11e0aa00
+        arch: amd64
+      - sha: c8232f58868aaf6356996ee2e1958e1164e77070458849bb1890870121694245
+        arch: arm64
diff --git a/quarkus-mandrel-builder-image/mandrel-23.0.x.yaml b/quarkus-mandrel-builder-image/mandrel-23.0.x.yaml
@@ -0,0 +1,20 @@
+images:
+
+  - graalvm-version: 23.0.1.2-Final
+    java-version: 17
+    tags: 23.0-java17, 23.0-jdk-17, jdk-17, jdk-17.0.8
+    variants:
+      - sha: cc73adfae094d05367e008d8ee3eebf7a08a3b45b504e55771dc739a7faabe3b
+        arch: amd64
+      - sha: 373d8341cfa678e3bdffeb8936c3edd8c353b19fdd54ba4cbe6711c6c1faa127
+        arch: arm64
+
+  - graalvm-version: 23.0.1.2-Final
+    java-version: 20
+    tags: 23.0-java20, 23.0-jdk-20, jdk-20, jdk-20.0.2
+    variants:
+      - sha: be992959df83beb9f5fe0ffe4606d76b2deba6cb86322b9d3614f09a8a2fbbc8
+        arch: amd64
+      - sha: e6ed1f76292a5f44bff076225ebbb503b940180b14d6468d8722769ff7eb9e9e
+        arch: arm64
+
diff --git a/quarkus-mandrel-builder-image/mandrel.yaml b/quarkus-mandrel-builder-image/mandrel.yaml
@@ -1,58 +1,5 @@
 images:
 
-  - graalvm-version: 22.3.2.1-Final
-    java-version: 17
-    variants:
-      - sha: 7c9f0cfc18137fd1ae976d9a4aacbadf764a6a07c7691481a8d8d9b78903212a
-        arch: amd64
-      - sha: 95995f1b99eb9323e214ea147624651366129b9cfb3e07590eeac59f02f47ed4
-        arch: arm64
-
-  - graalvm-version: 22.3.3.1-Final
-    java-version: 17
-    tag: 22.3-java17
-    variants:
-      - sha: 8449acd4426dd0b4bc278b167d2a9e729695d45ba0c75a65e6a894ce11e0aa00
-        arch: amd64
-      - sha: c8232f58868aaf6356996ee2e1958e1164e77070458849bb1890870121694245
-        arch: arm64
-
-  - graalvm-version: 23.0.0.0-Final
-    java-version: 17
-    tags: jdk-17.0.7
-    variants:
-      - sha: 3b5d4ea87f6c1cac698942068702e111ad44fd975517fb859aac11dd573f6dbb
-        arch: amd64
-      - sha: 5ee2ad025929fb4ea6f3c7c1933b04dbd9b5efd75d7c4ee7d82dd0cd47cafd9b
-        arch: arm64
-
-  - graalvm-version: 23.0.0.0-Final
-    java-version: 20
-    tags: jdk-20.0.1
-    variants:
-      - sha: 4b120a3272b4e637c3832b6245e100105ff07f46ad5b304f4844de5fad6b7fb7
-        arch: amd64
-      - sha: 3179c87dc9336a0283a5da2c3ba74ddbd4fbec52d9d8dd78cb6979b34ce8464a
-        arch: arm64
-
-  - graalvm-version: 23.0.1.2-Final
-    java-version: 17
-    tags: 23.0-java17, 23.0-jdk-17, jdk-17, jdk-17.0.8
-    variants:
-      - sha: cc73adfae094d05367e008d8ee3eebf7a08a3b45b504e55771dc739a7faabe3b
-        arch: amd64
-      - sha: 373d8341cfa678e3bdffeb8936c3edd8c353b19fdd54ba4cbe6711c6c1faa127
-        arch: arm64
-
-  - graalvm-version: 23.0.1.2-Final
-    java-version: 20
-    tags: 23.0-java20, 23.0-jdk-20, jdk-20, jdk-20.0.2
-    variants:
-      - sha: be992959df83beb9f5fe0ffe4606d76b2deba6cb86322b9d3614f09a8a2fbbc8
-        arch: amd64
-      - sha: e6ed1f76292a5f44bff076225ebbb503b940180b14d6468d8722769ff7eb9e9e
-        arch: arm64
-
   - graalvm-version: 23.1.0.0-Final
     java-version: 21
     tags: 23.1-java21, 23.1-jdk-21, jdk-21, jdk-21.0.0

diff --git a/quarkus-mandrel-builder-image/pom.xml b/quarkus-mandrel-builder-image/pom.xml
@@ -73,6 +73,18 @@
                 <jdock.alias>quay.io/quarkus/ubi-quarkus-mandrel-builder-image:__VERSION__-${maven.build.timestamp}</jdock.alias>
             </properties>
         </profile>
+        <profile>
+            <id>mandrel-22.x</id>
+            <properties>
+                <images.file>${project.basedir}/mandrel-22.x.yaml</images.file>
+            </properties>
+        </profile>
+        <profile>
+            <id>mandrel-23.0.x</id>
+            <properties>
+                <images.file>${project.basedir}/mandrel-23.0.x.yaml</images.file>
+            </properties>
+        </profile>
     </profiles>
 
 </project>