osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36717?usp=email ) Change subject: OBS: sync_obs_projects: remove AlmaLinux:8 ...................................................................... OBS: sync_obs_projects: remove AlmaLinux:8 Related: OS#6446 Change-Id: I19fc021a950790eab8b8074ea1c0cdd34232f4f8 --- M jobs/osmocom-obs-sync.yml M scripts/obs/sync_obs_projects.py 2 files changed, 10 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/36717/1 diff --git a/jobs/osmocom-obs-sync.yml b/jobs/osmocom-obs-sync.yml index a57f968..3776688 100644 --- a/jobs/osmocom-obs-sync.yml +++ b/jobs/osmocom-obs-sync.yml @@ -28,7 +28,6 @@ - shell: | export PYTHONUNBUFFERED=1 export DISTROS=" - AlmaLinux:8 Debian:10 Debian:11 Debian:12 diff --git a/scripts/obs/sync_obs_projects.py b/scripts/obs/sync_obs_projects.py index cc4635a..965aca2 100755 --- a/scripts/obs/sync_obs_projects.py +++ b/scripts/obs/sync_obs_projects.py @@ -124,8 +124,6 @@ def get_relevant_arches(project): - if project.startswith("AlmaLinux:"): - return ["x86_64"] if project.startswith("Raspbian:"): return ["armv7l"] @@ -226,21 +224,6 @@ prjconf += f"{line}\n" - # Extend the AlmaLinux prjconf to also set CentOS variables, as some of - # our prjconfigs and spec files rely on them - if project == "AlmaLinux:8": - print(f" appending CentOS 8 variables") - prjconf += "\n" - prjconf += "# CentOS 8 compat added by sync script\n" - prjconf += "%define centos_version 800\n" - prjconf += "%define centos_ver 8\n" - prjconf += "%define centos 8\n" - prjconf += "Macros:\n" - prjconf += "%centos_version 800\n" - prjconf += "%centos_ver 8\n" - prjconf += "%centos 8\n" - prjconf += ":Macros\n" - with open(temp_dest_new_prjconf, "w") as f: f.write(header) f.write(prjconf) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36717?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I19fc021a950790eab8b8074ea1c0cdd34232f4f8 Gerrit-Change-Number: 36717 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange