From ea492c0f30c1facbe431283fa3b4d75a7d08f55f Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 27 Jun 2022 12:15:07 +0200 Subject: [PATCH] containers-common-1-40.el9 - remove rhel-els and update shortnames - Related: #2061316 Signed-off-by: Jindrich Novy --- 001-rhel-shortnames-pyxis.conf | 27 ++++++++++++++++++--------- containers-common.spec | 10 +++++++--- pyxis.sh | 1 + 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/001-rhel-shortnames-pyxis.conf b/001-rhel-shortnames-pyxis.conf index a403c5a..77669a4 100644 --- a/001-rhel-shortnames-pyxis.conf +++ b/001-rhel-shortnames-pyxis.conf @@ -11,6 +11,7 @@ "3scale-amp2/system-rhel7" = "registry.redhat.io/3scale-amp2/system-rhel7" "3scale-amp2/toolbox-rhel8" = "registry.redhat.io/3scale-amp2/toolbox-rhel8" "3scale-amp2/zync-rhel8" = "registry.redhat.io/3scale-amp2/zync-rhel8" +"3scale-mas/3scale-rhel7" = "registry.redhat.io/3scale-mas/3scale-rhel7" "5f7d444f29373868204229e0/corent-jtrac-application" = "registry.connect.redhat.com/5f7d444f29373868204229e0/corent-jtrac-application" "5f7d444f29373868204229e0/corent-jtrac-operator" = "registry.connect.redhat.com/5f7d444f29373868204229e0/corent-jtrac-operator" "61725cc480cc9b10e9278631/vsphere-kubernetes-drivers-operator" = "registry.redhat.io/61725cc480cc9b10e9278631/vsphere-kubernetes-drivers-operator" @@ -143,7 +144,10 @@ "appdynamics/machine-agent-analytics" = "registry.connect.redhat.com/appdynamics/machine-agent-analytics" "appdynamics/machine-agent-netviz" = "registry.connect.redhat.com/appdynamics/machine-agent-netviz" "appdynamics/nodejs-agent-operator" = "registry.connect.redhat.com/appdynamics/nodejs-agent-operator" +"application-interconnect/skupper-config-sync-rhel8" = "registry.redhat.io/application-interconnect/skupper-config-sync-rhel8" "application-interconnect/skupper-operator-bundle" = "registry.redhat.io/application-interconnect/skupper-operator-bundle" +"application-interconnect/skupper-router-rhel8" = "registry.redhat.io/application-interconnect/skupper-router-rhel8" +"application-interconnect/skupper-service-controller-rhel8" = "registry.redhat.io/application-interconnect/skupper-service-controller-rhel8" "application-interconnect/skupper-site-controller-rhel8" = "registry.redhat.io/application-interconnect/skupper-site-controller-rhel8" "appranix/apx-controller" = "registry.redhat.io/appranix/apx-controller" "appranix/apx-manager" = "registry.connect.redhat.com/appranix/apx-manager" @@ -568,7 +572,6 @@ "devspaces/machineexec-rhel8" = "registry.redhat.io/devspaces/machineexec-rhel8" "devspaces/pluginregistry-rhel8" = "registry.redhat.io/devspaces/pluginregistry-rhel8" "devspaces/server-rhel8" = "registry.redhat.io/devspaces/server-rhel8" -"devspaces/theia-dev-rhel8" = "registry.redhat.io/devspaces/theia-dev-rhel8" "devspaces/theia-endpoint-rhel8" = "registry.redhat.io/devspaces/theia-endpoint-rhel8" "devspaces/theia-rhel8" = "registry.redhat.io/devspaces/theia-rhel8" "devspaces/traefik-rhel8" = "registry.redhat.io/devspaces/traefik-rhel8" @@ -634,12 +637,9 @@ "findability-sciences/fp-predict-plus-operator" = "registry.connect.redhat.com/findability-sciences/fp-predict-plus-operator" "findability-sciences/fp-predict-plus" = "registry.redhat.io/findability-sciences/fp-predict-plus" "fiware/orion-ld" = "quay.io/fiware/orion-ld" -"flux/helm-controller" = "registry.connect.redhat.com/flux/helm-controller" -"flux/image-automation-controller" = "registry.connect.redhat.com/flux/image-automation-controller" -"flux/image-reflector-controller" = "registry.connect.redhat.com/flux/image-reflector-controller" -"flux/kustomize-controller" = "registry.connect.redhat.com/flux/kustomize-controller" -"flux/notification-controller" = "registry.connect.redhat.com/flux/notification-controller" -"flux/source-controller" = "registry.connect.redhat.com/flux/source-controller" +"flux/helm-controller-old" = "registry.connect.redhat.com/flux/helm-controller-old" +"flux/kustomize-controller-old" = "registry.connect.redhat.com/flux/kustomize-controller-old" +"flux/source-controller-old" = "registry.connect.redhat.com/flux/source-controller-old" "fortanix/ccm-node-agent-dcap-operator-bundle" = "registry.connect.redhat.com/fortanix/ccm-node-agent-dcap-operator-bundle" "fortanix/ccm-node-agent-dcap-operator" = "registry.connect.redhat.com/fortanix/ccm-node-agent-dcap-operator" "fortanix/ccm-node-agent-operator-bundle" = "registry.connect.redhat.com/fortanix/ccm-node-agent-operator-bundle" @@ -1038,6 +1038,7 @@ "kasten/executor" = "registry.connect.redhat.com/kasten/executor" "kasten/frontend" = "registry.redhat.io/kasten/frontend" "kasten/grafana" = "registry.connect.redhat.com/kasten/grafana" +"kasten/init" = "registry.redhat.io/kasten/init" "kasten/jobs" = "registry.connect.redhat.com/kasten/jobs" "kasten/k10-operator-paygo" = "registry.connect.redhat.com/kasten/k10-operator-paygo" "kasten/k10-operator" = "registry.connect.redhat.com/kasten/k10-operator" @@ -1048,6 +1049,7 @@ "kasten/kasten-rhmp-bundle" = "registry.connect.redhat.com/kasten/kasten-rhmp-bundle" "kasten/kasten-term-rhmp-bundle" = "registry.connect.redhat.com/kasten/kasten-term-rhmp-bundle" "kasten/logging" = "registry.connect.redhat.com/kasten/logging" +"kasten/mccontrollermanager" = "registry.redhat.io/kasten/mccontrollermanager" "kasten/metering" = "registry.connect.redhat.com/kasten/metering" "kasten/prometheus" = "registry.redhat.io/kasten/prometheus" "kasten/restorectl" = "registry.connect.redhat.com/kasten/restorectl" @@ -1357,6 +1359,7 @@ "nuagenetworks/rhosp16-openstack-horizon-20-10-5" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-10-5" "nuagenetworks/rhosp16-openstack-horizon-20-10-6" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-10-6" "nuagenetworks/rhosp16-openstack-horizon-20-10-7" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-10-7" +"nuagenetworks/rhosp16-openstack-horizon-20-10-9" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-10-9" "nuagenetworks/rhosp16-openstack-horizon-20-5-2" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-5-2" "nuagenetworks/rhosp16-openstack-horizon-20-5-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-5-3" "nuagenetworks/rhosp16-openstack-horizon-20-latest" = "registry.redhat.io/nuagenetworks/rhosp16-openstack-horizon-20-latest" @@ -2339,6 +2342,7 @@ "rhel8/net-snmp" = "registry.redhat.io/rhel8/net-snmp" "rhel8/nginx-118" = "registry.redhat.io/rhel8/nginx-118" "rhel8/nginx-120" = "registry.redhat.io/rhel8/nginx-120" +"rhel8/nodejs-12" = "registry.redhat.io/rhel8/nodejs-12" "rhel8/nodejs-14-minimal" = "registry.redhat.io/rhel8/nodejs-14-minimal" "rhel8/nodejs-14" = "registry.redhat.io/rhel8/nodejs-14" "rhel8/nodejs-16-minimal" = "registry.redhat.io/rhel8/nodejs-16-minimal" @@ -2363,6 +2367,7 @@ "rhel8/rhel-guest-image" = "registry.redhat.io/rhel8/rhel-guest-image" "rhel8/rsyslog" = "registry.redhat.io/rhel8/rsyslog" "rhel8/ruby-25" = "registry.redhat.io/rhel8/ruby-25" +"rhel8/ruby-26" = "registry.redhat.io/rhel8/ruby-26" "rhel8/ruby-27" = "registry.redhat.io/rhel8/ruby-27" "rhel8/ruby-30" = "registry.redhat.io/rhel8/ruby-30" "rhel8/ruby-31" = "registry.redhat.io/rhel8/ruby-31" @@ -2371,7 +2376,6 @@ "rhel8/skopeo" = "registry.redhat.io/rhel8/skopeo" "rhel8/support-tools" = "registry.redhat.io/rhel8/support-tools" "rhel8/varnish-6" = "registry.redhat.io/rhel8/varnish-6" -"rhel9-0-els/rhel" = "registry.redhat.io/rhel9-0-els/rhel" "rhel9/buildah" = "registry.redhat.io/rhel9/buildah" "rhel9/cups" = "registry.redhat.io/rhel9/cups" "rhel9/flatpak-runtime" = "registry.redhat.io/rhel9/flatpak-runtime" @@ -2465,7 +2469,7 @@ "rhosp13/openstack-aodh-notifier" = "registry.access.redhat.com/rhosp13/openstack-aodh-notifier" "rhosp13/openstack-barbican-api" = "registry.access.redhat.com/rhosp13/openstack-barbican-api" "rhosp13/openstack-barbican-base" = "registry.access.redhat.com/rhosp13/openstack-barbican-base" -"rhosp13/openstack-barbican-keystone-listener" = "registry.redhat.io/rhosp13/openstack-barbican-keystone-listener" +"rhosp13/openstack-barbican-keystone-listener" = "registry.access.redhat.com/rhosp13/openstack-barbican-keystone-listener" "rhosp13/openstack-barbican-worker" = "registry.access.redhat.com/rhosp13/openstack-barbican-worker" "rhosp13/openstack-base" = "registry.access.redhat.com/rhosp13/openstack-base" "rhosp13/openstack-ceilometer-base" = "registry.access.redhat.com/rhosp13/openstack-ceilometer-base" @@ -3010,6 +3014,7 @@ "ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal" "ubi8/nginx-118" = "registry.access.redhat.com/ubi8/nginx-118" "ubi8/nginx-120" = "registry.access.redhat.com/ubi8/nginx-120" +"ubi8/nodejs-12" = "registry.access.redhat.com/ubi8/nodejs-12" "ubi8/nodejs-14-minimal" = "registry.access.redhat.com/ubi8/nodejs-14-minimal" "ubi8/nodejs-14" = "registry.access.redhat.com/ubi8/nodejs-14" "ubi8/nodejs-16-minimal" = "registry.access.redhat.com/ubi8/nodejs-16-minimal" @@ -3034,6 +3039,7 @@ "ubi8/python-39" = "registry.access.redhat.com/ubi8/python-39" "ubi8" = "registry.access.redhat.com/ubi8" "ubi8/ruby-25" = "registry.access.redhat.com/ubi8/ruby-25" +"ubi8/ruby-26" = "registry.access.redhat.com/ubi8/ruby-26" "ubi8/ruby-27" = "registry.access.redhat.com/ubi8/ruby-27" "ubi8/ruby-30" = "registry.access.redhat.com/ubi8/ruby-30" "ubi8/s2i-base" = "registry.access.redhat.com/ubi8/s2i-base" @@ -3077,9 +3083,11 @@ "veritas-technologies/infoscale-csi-plugin" = "registry.connect.redhat.com/veritas-technologies/infoscale-csi-plugin" "veritas-technologies/infoscale-dr-operator" = "registry.connect.redhat.com/veritas-technologies/infoscale-dr-operator" "veritas-technologies/infoscale-license" = "registry.connect.redhat.com/veritas-technologies/infoscale-license" +"veritas-technologies/infoscale-licensing-operator-bundle" = "registry.connect.redhat.com/veritas-technologies/infoscale-licensing-operator-bundle" "veritas-technologies/infoscale-operator-bundle" = "registry.redhat.io/veritas-technologies/infoscale-operator-bundle" "veritas-technologies/infoscale-operator" = "registry.connect.redhat.com/veritas-technologies/infoscale-operator" "veritas-technologies/infoscale" = "registry.connect.redhat.com/veritas-technologies/infoscale" +"veritas-technologies/infoscale-sds-operator-bundle" = "registry.connect.redhat.com/veritas-technologies/infoscale-sds-operator-bundle" "veritas-technologies/infoscale-vxfen" = "registry.connect.redhat.com/veritas-technologies/infoscale-vxfen" "veritas-technologies/rhosp-16-1-nbosdm-10-0" = "registry.redhat.io/veritas-technologies/rhosp-16-1-nbosdm-10-0" "veritas-technologies/rhosp-16-1-nbosdmapi-10-0" = "registry.connect.redhat.com/veritas-technologies/rhosp-16-1-nbosdmapi-10-0" @@ -3107,6 +3115,7 @@ "workload-availability/node-maintenance-must-gather-rhel8" = "registry.access.redhat.com/workload-availability/node-maintenance-must-gather-rhel8" "workload-availability/node-maintenance-operator-bundle" = "registry.access.redhat.com/workload-availability/node-maintenance-operator-bundle" "workload-availability/node-maintenance-rhel8-operator" = "registry.access.redhat.com/workload-availability/node-maintenance-rhel8-operator" +"workload-availability/self-node-remediation-rhel8-operator" = "registry.access.redhat.com/workload-availability/self-node-remediation-rhel8-operator" "xebialabs/xl-release" = "registry.connect.redhat.com/xebialabs/xl-release" "xsky/xsky-csi-iscsi-driver" = "registry.connect.redhat.com/xsky/xsky-csi-iscsi-driver" "xsky/xsky-csi-nfs-driver" = "registry.connect.redhat.com/xsky/xsky-csi-nfs-driver" diff --git a/containers-common.spec b/containers-common.spec index 59b66d8..9e2f79c 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildRequires: /usr/bin/go-md2man @@ -97,7 +97,7 @@ separately. %package -n aardvark-dns Version: 1.0.1 -Release: 39%{?dist} +Release: 40%{?dist} URL: https://github.com/containers/aardvark-dns Summary: Authoritative DNS server for A/AAAA container records License: ASL 2.0 and BSD and MIT @@ -117,7 +117,7 @@ Read more about configuration in `src/backend/mod.rs`. %package -n netavark Version: 1.0.1 -Release: 39%{?dist} +Release: 40%{?dist} URL: https://github.com/containers/netavark Summary: OCI network stack License: ASL 2.0 and BSD and MIT @@ -306,6 +306,10 @@ EOF %{_mandir}/man1/netavark.1* %changelog +* Mon Jun 27 2022 Jindrich Novy - 2:1-40 +- remove rhel-els and update shortnames +- Related: #2061316 + * Tue Jun 14 2022 Jindrich Novy - 2:1-39 - update shortnames - Related: #2061316 diff --git a/pyxis.sh b/pyxis.sh index ad8423f..112a560 100755 --- a/pyxis.sh +++ b/pyxis.sh @@ -73,5 +73,6 @@ for D in `cut -d\ -f1 /tmp/r.conf | sort | uniq -d`; do fi done +sed -i '/.*rhel.*-els\/.*$/d' /tmp/r.conf echo "[aliases]" > 001-rhel-shortnames-pyxis.conf sort /tmp/r.conf >> 001-rhel-shortnames-pyxis.conf