Merge pull request #600 from Vogtinator/twjeos

Fix Leap JeOS, add TW JeOS
openSUSE · Jul 11, 2019 · fd3e7fb · fd3e7fb
2 parents 901d98f + bfb7fd1
commit fd3e7fb
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 12 deletions.
diff --git a/app/data/15.1.yml.erb b/app/data/15.1.yml.erb
@@ -54,24 +54,24 @@
         url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-XEN-Current.qcow2.sha256
     - name: MS HyperV
       short: <%= _("For running virtual machines on MS HyperV") %>
-      primary_link: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-MS-HyperV-Current.vhdx
+      primary_link: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-MS-HyperV-Current.vhdx.xz
       links:
       - name: <%= _("Metalink") %>
-        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-MS-HyperV-Current.vhdx.meta4
+        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-MS-HyperV-Current.vhdx.xz.meta4
       - name: <%= _("Pick Mirror") %>
-        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-MS-HyperV-Current.vhdx?mirrorlist
+        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-MS-HyperV-Current.vhdx.xz?mirrorlist
       - name: <%= _("Checksum") %>
-        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-MS-HyperV-Current.vhdx.sha256
+        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-MS-HyperV-Current.vhdx.zx.sha256
     - name: VMware
       short: <%= _("For running virtual machines in VMware") %>
-      primary_link: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-VMware-Current.vmdk
+      primary_link: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-VMware-Current.vmdk.xz
       links:
       - name: <%= _("Metalink") %>
-        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-VMware-Current.vmdk.meta4
+        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-VMware-Current.vmdk.xz.meta4
       - name: <%= _("Pick Mirror") %>
-        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-VMware-Current.vmdk?mirrorlist
+        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-VMware-Current.vmdk.xz?mirrorlist
       - name: <%= _("Checksum") %>
-        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-VMware-Current.vmdk.sha256
+        url: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-VMware-Current.vmdk.xz.sha256
     - name: OpenStack-Cloud
       short: <%= _("For running virtual machines in OpenStack") %>
       primary_link: /distribution/leap/<%= @version %>/jeos/openSUSE-Leap-<%= @version %>-JeOS.x86_64-<%= @version %>.0-OpenStack-Cloud-Current.qcow2

diff --git a/app/data/tumbleweed.yml.erb b/app/data/tumbleweed.yml.erb
@@ -89,7 +89,6 @@
         url: /ports/ppc/tumbleweed/iso/openSUSE-Tumbleweed-NET-ppc64le-Current.iso?mirrorlist
       - name: <%= _("Checksum") %>
         url: /ports/ppc/tumbleweed/iso/openSUSE-Tumbleweed-NET-ppc64le-Current.iso.sha256
-
 - name: Kubic
   arches:
   - name: x86_64
@@ -116,6 +115,65 @@
         url: /ports/aarch64/tumbleweed/iso/openSUSE-Kubic-DVD-aarch64-Current.iso?mirrorlist
       - name: <%= _("Checksum") %>
         url: /ports/aarch64/tumbleweed/iso/openSUSE-Kubic-DVD-aarch64-Current.iso.sha256
+- name: <%= _("JeOS") %>
+  arches:
+  - name: x86_64
+    types:
+    - name: KVM and XEN
+      short: <%= _("For use in KVM or XEN HVM hypervisors") %>
+      image_size: 250MB
+      primary_link: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-kvm-and-xen.qcow2
+      links:
+      - name: <%= _("Metalink") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-kvm-and-xen.qcow2.meta4
+      - name: <%= _("Pick Mirror") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-kvm-and-xen.qcow2?mirrorlist
+      - name: <%= _("Checksum") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-kvm-and-xen.qcow2.sha256
+    - name: XEN
+      short: <%= _("For use in XEN PV hypervisors") %>
+      image_size: 250MB
+      primary_link: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-XEN.qcow2
+      links:
+      - name: <%= _("Metalink") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-XEN.qcow2.meta4
+      - name: <%= _("Pick Mirror") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-XEN.qcow2?mirrorlist
+      - name: <%= _("Checksum") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-XEN.qcow2.sha256
+    - name: MS HyperV
+      short: <%= _("For running virtual machines on MS HyperV") %>
+      image_size: 900MB
+      primary_link: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-MS-HyperV.vhdx.xz
+      links:
+      - name: <%= _("Metalink") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-MS-HyperV.vhdx.xz.meta4
+      - name: <%= _("Pick Mirror") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-MS-HyperV.vhdx.xz?mirrorlist
+      - name: <%= _("Checksum") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-MS-HyperV.vhdx.xz.sha256
+    - name: VMware
+      short: <%= _("For running virtual machines in VMware") %>
+      image_size: 800MB
+      primary_link: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-VMware.vmdk.xz
+      links:
+      - name: <%= _("Metalink") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-VMware.vmdk.xz.meta4
+      - name: <%= _("Pick Mirror") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-VMware.vmdk.xz?mirrorlist
+      - name: <%= _("Checksum") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-VMware.vmdk.xz.sha256
+    - name: OpenStack-Cloud
+      short: <%= _("For running virtual machines in OpenStack") %>
+      image_size: 250MB
+      primary_link: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-OpenStack-Cloud.qcow2
+      links:
+      - name: <%= _("Metalink") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-OpenStack-Cloud.qcow2.meta4
+      - name: <%= _("Pick Mirror") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-OpenStack-Cloud.qcow2?mirrorlist
+      - name: <%= _("Checksum") %>
+        url: /tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-OpenStack-Cloud.qcow2.sha256
 - name: <%= _("Live") %>
   choosing-media: true
   info: >-

diff --git a/app/views/distributions/_distribution.html.erb b/app/views/distributions/_distribution.html.erb
@@ -26,9 +26,11 @@
       <li class="nav-item">
         <a class="nav-link h-100<% if @yaml_data[0]["name"] == tab["name"] %> active<% end %>" data-toggle="tab" href="#<%= tab["name"] %>-ports" role="tab">
           <%= _(tab["name"]) %>
-          <% tab["arches"].try(:each) do |arch| %>
-            <span class="badge badge-<%= arch["color"] || @colour %>"><%= arch["name"] %></span>
-          <% end %>
+          <div class="text-nowrap">
+            <% tab["arches"].try(:each) do |arch| %>
+              <span class="badge badge-<%= arch["color"] || @colour %>"><%= arch["name"] %></span>
+            <% end %>
+          </div>
         </a>
       </li>
       <% end %>