Compare commits
23 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 88cfc2738d | |||
| 12af08029b | |||
| 14a322ab24 | |||
|
ba3e773d1e
|
|||
|
c6c4919509
|
|||
|
a136ee93a3
|
|||
|
720b2399ff
|
|||
| a138f3dbfa | |||
| f6b632eda6 | |||
| 144486306c | |||
|
cb4af76fa0
|
|||
|
1c10c380e1
|
|||
| e51cca16c3 | |||
| 8db13413e7 | |||
| 1333cc401c | |||
|
25eaabb8d0
|
|||
|
e339e83e5e
|
|||
|
de11400ba4
|
|||
|
01db79b971
|
|||
|
01d21108fc
|
|||
| 5dbf69e7d2 | |||
| 8833455709 | |||
| 5ca554f039 |
@@ -1,3 +1,3 @@
|
||||
PROJECT = "isv:SUSE:Edge:Factory"
|
||||
PROJECT = "isv:SUSE:Edge:3.5"
|
||||
REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
|
||||
BRANCH = "main"
|
||||
BRANCH = "3.5"
|
||||
|
||||
@@ -6,7 +6,6 @@ import sys
|
||||
|
||||
from collections import Counter
|
||||
|
||||
|
||||
def get_buildstatus(project: str) -> ET.Element:
|
||||
for _ in range(5):
|
||||
try:
|
||||
@@ -18,17 +17,8 @@ def get_buildstatus(project: str) -> ET.Element:
|
||||
continue
|
||||
print("Failed to get buildstatus from OBS")
|
||||
|
||||
|
||||
def do_wait(project: str, commit: str) -> ET.Element:
|
||||
def do_wait(project:str, commit:str) -> ET.Element:
|
||||
last_state = None
|
||||
waiting_states = (
|
||||
"blocked",
|
||||
"scheduled",
|
||||
"dispatching",
|
||||
"building",
|
||||
"signing",
|
||||
"finished",
|
||||
)
|
||||
while True:
|
||||
time.sleep(5)
|
||||
status = get_buildstatus(project)
|
||||
@@ -43,25 +33,17 @@ def do_wait(project: str, commit: str) -> ET.Element:
|
||||
else:
|
||||
last_state = status.get("state")
|
||||
|
||||
scminfo = {e.text for e in status.findall(".//scminfo")}
|
||||
scminfo = { e.text for e in status.findall(".//scminfo") }
|
||||
if len(scminfo) != 1 or scminfo.pop() != commit:
|
||||
print("Waiting for OBS to sync with SCM")
|
||||
continue
|
||||
|
||||
if not all(
|
||||
[
|
||||
e.get("state") == "published" # Only consider if all packages are published
|
||||
and e.get("dirty") is None # Exclude states needing recalculation
|
||||
and e.get("code") not in waiting_states # Exclude transient/waiting states
|
||||
for e in status.findall("./result")
|
||||
] + [ e.get("code") not in waiting_states for e in status.findall("./status") ]
|
||||
):
|
||||
if not all([ e.get('state') == "published" and e.get('dirty') is None for e in status.findall("./result")]):
|
||||
print("Waiting for OBS to finish building")
|
||||
continue
|
||||
|
||||
return status
|
||||
|
||||
|
||||
|
||||
def print_results(status: ET.Element) -> bool:
|
||||
results = {}
|
||||
failed = []
|
||||
@@ -69,15 +51,15 @@ def print_results(status: ET.Element) -> bool:
|
||||
repo = results.get(e.get("repository"), {})
|
||||
repo[e.get("arch")] = e
|
||||
results[e.get("repository")] = repo
|
||||
|
||||
|
||||
for repo in results.keys():
|
||||
print(f"{repo}:")
|
||||
depth = 1
|
||||
depth=1
|
||||
for arch in results[repo].keys():
|
||||
counts = Counter()
|
||||
if repo != "charts":
|
||||
print(f"\t{arch}:")
|
||||
depth = 2
|
||||
depth=2
|
||||
for package in results[repo][arch].findall("./status"):
|
||||
if package.get("code") in ["excluded", "disabled"]:
|
||||
continue
|
||||
@@ -88,9 +70,9 @@ def print_results(status: ET.Element) -> bool:
|
||||
else:
|
||||
failed.append(f"{package.get('package')} ({arch})")
|
||||
counts[package.get("code")] += 1
|
||||
for code, count in counts.items():
|
||||
print("\t" * depth, f"{code}: {count}")
|
||||
|
||||
for (code, count) in counts.items():
|
||||
print("\t"*depth, f"{code}: {count}")
|
||||
|
||||
failed.sort()
|
||||
if failed:
|
||||
print("\nPackages failing: ")
|
||||
@@ -98,7 +80,6 @@ def print_results(status: ET.Element) -> bool:
|
||||
print("\t", fail)
|
||||
return len(failed)
|
||||
|
||||
|
||||
def main():
|
||||
project = os.environ.get("OBS_PROJECT")
|
||||
sha = os.environ.get("GIT_SHA")
|
||||
@@ -106,6 +87,5 @@ def main():
|
||||
status = do_wait(project, sha)
|
||||
sys.exit(print_results(status))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.get</param>
|
||||
<param name="revision">v1.4.1</param>
|
||||
<param name="revision">v1.2.5</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
%define project github.com/hauler-dev/hauler
|
||||
|
||||
Name: hauler
|
||||
Version: 1.4.1
|
||||
Version: 1.2.5
|
||||
Release: 0
|
||||
Summary: Airgap Swiss Army Knife
|
||||
License: Apache-2.0
|
||||
URL: https://github.com/hauler-dev/hauler
|
||||
Source: hauler-%{version}.tar
|
||||
Source1: vendor.tar.gz
|
||||
BuildRequires: golang(API) = 1.25
|
||||
BuildRequires: golang-packaging
|
||||
|
||||
%description
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!BuildTag: %%IMG_PREFIX%%release-manifest:3.6.0
|
||||
#!BuildTag: %%IMG_PREFIX%%release-manifest:3.5.1
|
||||
ARG SLE_VERSION
|
||||
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
|
||||
|
||||
@@ -7,11 +7,11 @@ FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
|
||||
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
|
||||
LABEL org.opencontainers.image.title="SUSE Edge Release Manifest"
|
||||
LABEL org.opencontainers.image.description="Release Manifest containing information about a specific SUSE Edge release"
|
||||
LABEL org.opencontainers.image.version="3.6.0"
|
||||
LABEL org.opencontainers.image.version="3.5.1"
|
||||
LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
|
||||
LABEL org.opencontainers.image.created="%BUILDTIME%"
|
||||
LABEL org.opencontainers.image.vendor="SUSE LLC"
|
||||
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.6.0"
|
||||
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.5.1"
|
||||
LABEL org.openbuildservice.disturl="%DISTURL%"
|
||||
LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
|
||||
LABEL com.suse.eula="SUSE Combined EULA February 2024"
|
||||
|
||||
@@ -1,61 +1,61 @@
|
||||
apiVersion: lifecycle.suse.com/v1alpha1
|
||||
kind: ReleaseManifest
|
||||
metadata:
|
||||
name: release-manifest-3-6-0
|
||||
name: release-manifest-3-5-1
|
||||
spec:
|
||||
releaseVersion: 3.6.0
|
||||
releaseVersion: 3.5.1
|
||||
components:
|
||||
kubernetes:
|
||||
k3s:
|
||||
version: v1.34.2+k3s1
|
||||
version: v1.34.4+k3s1
|
||||
coreComponents:
|
||||
- name: traefik-crd
|
||||
version: 37.1.1+up37.1.0
|
||||
version: 38.0.201+up38.0.2
|
||||
type: HelmChart
|
||||
- name: traefik
|
||||
version: 37.1.1+up37.1.0
|
||||
version: 38.0.201+up38.0.2
|
||||
type: HelmChart
|
||||
- name: local-path-provisioner
|
||||
containers:
|
||||
- name: local-path-provisioner
|
||||
image: rancher/local-path-provisioner:v0.0.32
|
||||
image: rancher/local-path-provisioner:v0.0.34
|
||||
type: Deployment
|
||||
- name: coredns
|
||||
containers:
|
||||
- name: coredns
|
||||
image: rancher/mirrored-coredns-coredns:1.13.1
|
||||
image: rancher/mirrored-coredns-coredns:1.14.1
|
||||
type: Deployment
|
||||
- name: metrics-server
|
||||
containers:
|
||||
- name: metrics-server
|
||||
image: rancher/mirrored-metrics-server:v0.8.0
|
||||
image: rancher/mirrored-metrics-server:v0.8.1
|
||||
type: Deployment
|
||||
rke2:
|
||||
version: v1.34.2+rke2r1
|
||||
version: v1.34.4+rke2r1
|
||||
coreComponents:
|
||||
- name: rke2-cilium
|
||||
version: 1.18.300
|
||||
version: 1.19.001
|
||||
type: HelmChart
|
||||
- name: rke2-canal
|
||||
version: v3.30.3-build2025101500
|
||||
version: v3.31.3-build2026020600
|
||||
type: HelmChart
|
||||
- name: rke2-calico-crd
|
||||
version: v3.30.401
|
||||
version: v3.31.300
|
||||
type: HelmChart
|
||||
- name: rke2-calico
|
||||
version: v3.30.401
|
||||
version: v3.31.300
|
||||
type: HelmChart
|
||||
- name: rke2-coredns
|
||||
version: 1.44.300
|
||||
version: 1.45.201
|
||||
type: HelmChart
|
||||
- name: rke2-ingress-nginx
|
||||
version: 4.13.400
|
||||
version: 4.14.302
|
||||
type: HelmChart
|
||||
- name: rke2-metrics-server
|
||||
version: 3.13.002
|
||||
version: 3.13.007
|
||||
type: HelmChart
|
||||
- name: rancher-vsphere-csi
|
||||
version: 3.5.0-rancher100
|
||||
version: 3.5.0-rancher200
|
||||
type: HelmChart
|
||||
- name: rancher-vsphere-cpi
|
||||
version: 1.12.100
|
||||
@@ -67,10 +67,16 @@ spec:
|
||||
version: 0.1.2500
|
||||
type: HelmChart
|
||||
- name: rke2-snapshot-controller-crd
|
||||
version: 4.0.003
|
||||
version: 4.2.001
|
||||
type: HelmChart
|
||||
- name: rke2-snapshot-controller
|
||||
version: 4.0.003
|
||||
version: 4.2.001
|
||||
type: HelmChart
|
||||
- name: rke2-traefik-crd
|
||||
version: 39.0.000
|
||||
type: HelmChart
|
||||
- name: rke2-traefik
|
||||
version: 39.0.000
|
||||
type: HelmChart
|
||||
operatingSystem:
|
||||
version: '6.2'
|
||||
@@ -85,15 +91,16 @@ spec:
|
||||
- prettyName: Rancher
|
||||
releaseName: rancher
|
||||
chart: rancher
|
||||
version: 2.13.1
|
||||
version: 2.13.3
|
||||
repository: https://charts.rancher.com/server-charts/prime
|
||||
values:
|
||||
postDelete:
|
||||
enabled: false
|
||||
- prettyName: Longhorn
|
||||
releaseName: longhorn
|
||||
chart: oci://dp.apps.rancher.io/charts/suse-storage
|
||||
version: 1.10.1
|
||||
chart: suse-storage
|
||||
version: 1.10.2
|
||||
repository: oci://dp.apps.rancher.io/charts
|
||||
- prettyName: MetalLB
|
||||
releaseName: metallb
|
||||
chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metallb'
|
||||
@@ -113,12 +120,12 @@ spec:
|
||||
- prettyName: NeuVector
|
||||
releaseName: neuvector
|
||||
chart: neuvector
|
||||
version: 108.0.1+up2.8.10
|
||||
version: 108.0.2+up2.8.11
|
||||
repository: https://charts.rancher.io
|
||||
dependencyCharts:
|
||||
- releaseName: neuvector-crd
|
||||
chart: neuvector-crd
|
||||
version: 108.0.1+up2.8.10
|
||||
version: 108.0.2+up2.8.11
|
||||
repository: https://charts.rancher.io
|
||||
addonCharts:
|
||||
- releaseName: neuvector-ui-ext
|
||||
@@ -132,11 +139,11 @@ spec:
|
||||
- prettyName: Elemental
|
||||
releaseName: elemental-operator
|
||||
chart: oci://registry.suse.com/rancher/elemental-operator-chart
|
||||
version: 1.8.0
|
||||
version: 1.8.1
|
||||
dependencyCharts:
|
||||
- releaseName: elemental-operator-crds
|
||||
chart: oci://registry.suse.com/rancher/elemental-operator-crds-chart
|
||||
version: 1.8.0
|
||||
version: 1.8.1
|
||||
addonCharts:
|
||||
- releaseName: elemental
|
||||
chart: elemental
|
||||
|
||||
Reference in New Issue
Block a user