Migrate to CephFS - eclipse.pde, ee4j, ee4j.ca

eclipse-cbi · Sep 27, 2024 · 46ef600 · 46ef600
1 parent 3351fd5
commit 46ef600
Show file tree

Hide file tree

Showing 18 changed files with 1,173 additions and 7 deletions.
diff --git a/instances/eclipse.pde/config.jsonnet b/instances/eclipse.pde/config.jsonnet
@@ -28,4 +28,5 @@
       },
     },
   },
+  seLinuxLevel: "s0:c51,c25",
 }
diff --git a/instances/eclipse.pde/target/config.json b/instances/eclipse.pde/target/config.json
@@ -997,6 +997,7 @@
       },
       "generate": false
    },
+   "seLinuxLevel": "s0:c51,c25",
    "secrets": {
       "dockerconfigjson": {
          "dockerconfigjson-for-pull-as-default": {

diff --git a/instances/eclipse.pde/target/jenkins/configuration.yml b/instances/eclipse.pde/target/jenkins/configuration.yml
@@ -808,6 +808,8 @@ tool:
         home: "/opt/tools/java/openjdk/latest"
       - name: "openjdk-ea-latest"
         home: "/opt/tools/java/openjdk/ea-latest"
+      - name: "openjdk-jdk24-latest"
+        home: "/opt/tools/java/openjdk/jdk-24/latest"
       - name: "openjdk-jdk23-latest"
         home: "/opt/tools/java/openjdk/jdk-23/latest"
       - name: "openjdk-jdk22-latest"

diff --git a/instances/eclipse.pde/target/k8s/configmap-jenkins-config.yml b/instances/eclipse.pde/target/k8s/configmap-jenkins-config.yml
@@ -831,6 +831,8 @@ data:
             home: "/opt/tools/java/openjdk/latest"
           - name: "openjdk-ea-latest"
             home: "/opt/tools/java/openjdk/ea-latest"
+          - name: "openjdk-jdk24-latest"
+            home: "/opt/tools/java/openjdk/jdk-24/latest"
           - name: "openjdk-jdk23-latest"
             home: "/opt/tools/java/openjdk/jdk-23/latest"
           - name: "openjdk-jdk22-latest"

diff --git a/instances/eclipse.pde/target/k8s/m2-dir.json b/instances/eclipse.pde/target/k8s/m2-dir.json
@@ -2,7 +2,7 @@
    "apiVersion": "v1",
    "data": {
       ".mavenrc": "set -- -V -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"",
-      "toolchains.xml": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<toolchains>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-1.8</id>\n      <version>1.8</version>\n      <vendor>oracle</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-9</id>\n      <version>9</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-9/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-10</id>\n      <version>10</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-10/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-11</id>\n      <version>11</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-12</id>\n      <version>12</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-12/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-13</id>\n      <version>13</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-13/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-14</id>\n      <version>14</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-14/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-15</id>\n      <version>15</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-15/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-16</id>\n      <version>16</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-16/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-17</id>\n      <version>17</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-17/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-18</id>\n      <version>18</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-18/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-19</id>\n      <version>19</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-19/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-20</id>\n      <version>20</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-20/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-21</id>\n      <version>21</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-21/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-22</id>\n      <version>22</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-22/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-23</id>\n      <version>23</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-23/latest</jdkHome></configuration>\n  </toolchain>\n</toolchains>\n"
+      "toolchains.xml": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<toolchains>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-1.8</id>\n      <version>1.8</version>\n      <vendor>oracle</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-9</id>\n      <version>9</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-9/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-10</id>\n      <version>10</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-10/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-11</id>\n      <version>11</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-12</id>\n      <version>12</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-12/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-13</id>\n      <version>13</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-13/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-14</id>\n      <version>14</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-14/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-15</id>\n      <version>15</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-15/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-16</id>\n      <version>16</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-16/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-17</id>\n      <version>17</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-17/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-18</id>\n      <version>18</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-18/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-19</id>\n      <version>19</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-19/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-20</id>\n      <version>20</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-20/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-21</id>\n      <version>21</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-21/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-22</id>\n      <version>22</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-22/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-23</id>\n      <version>23</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-23/latest</jdkHome></configuration>\n  </toolchain>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <id>JavaSE-24</id>\n      <version>24</version>\n      <vendor>openjdk</vendor>\n    </provides>\n    <configuration><jdkHome>/opt/tools/java/openjdk/jdk-24/latest</jdkHome></configuration>\n  </toolchain>\n</toolchains>\n"
    },
    "kind": "ConfigMap",
    "metadata": {

diff --git a/instances/eclipse.pde/target/k8s/statefulset.json b/instances/eclipse.pde/target/k8s/statefulset.json
@@ -119,6 +119,12 @@
                         "cpu": "850m"
                      }
                   },
+                  "securityContext": {
+                     "seLinuxOptions": {
+                        "level": "s0:c51,c25",
+                        "type": "spc_t"
+                     }
+                  },
                   "volumeMounts": [
                      {
                         "mountPath": "/var/jenkins",

diff --git a/instances/ee4j.ca/config.jsonnet b/instances/ee4j.ca/config.jsonnet
@@ -8,4 +8,5 @@
       "copyartifact",
     ],
   },
+  seLinuxLevel: "s0:c31,c5",
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,5 @@ @@
           },
         },
       },
+      seLinuxLevel: "s0:c51,c25",
     }