From a52d700d86fccb78ad9f92780efd5170c324325e Mon Sep 17 00:00:00 2001 From: Thiago Brito Date: Thu, 6 Jan 2022 14:09:42 -0300 Subject: [PATCH] Fixing job issues - Missing nss-devel-3.53.1 pkg on centos - Commenting out leap15 job until the mirror are updated to 15.3 - Commenting configurations related to not yet set debian mirror Depends-On: https://review.opendev.org/c/openstack/watcher/+/823606 Signed-off-by: Thiago Brito Change-Id: Idee88bd7eac1994fa899b22ccd3c6676a643583b --- dockerfiles/centos/CentOS.repo | 7 ++++++ playbooks/vars.yaml | 45 +++++++++++++++++----------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dockerfiles/centos/CentOS.repo b/dockerfiles/centos/CentOS.repo index 55930fd5..0f57ba55 100644 --- a/dockerfiles/centos/CentOS.repo +++ b/dockerfiles/centos/CentOS.repo @@ -27,3 +27,10 @@ name=CentOS-$releasever - OpenStack baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/cloud/$basearch/openstack-victoria/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud + +[centos-8-stream-appstream] +includepkgs=nss* +name=CentOS Linux $releasever stream - AppStream +baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever-stream/AppStream/$basearch/os/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml index 703dd6b5..5619dd9f 100644 --- a/playbooks/vars.yaml +++ b/playbooks/vars.yaml @@ -36,7 +36,6 @@ distros: PROJECT: requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements FROM: base:centos - PYTHON3: yes - name: ubuntu_focal image: ubuntu:focal release: master @@ -77,32 +76,32 @@ distros: PROJECT: requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements FROM: base:ubuntu_bionic - - name: leap15 - release: master - buildargs: - base: - PACKAGE_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/opensuse/" - PIP_INDEX_URL: http://{{ zuul_site_mirror_fqdn }}/pypi/simple - PIP_TRUSTED_HOST: "{{ zuul_site_mirror_fqdn }}" - project: - PROJECT: "{{ project }}" - PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} - WHEELS: 172.17.0.1:5000/loci/requirements:master-leap15 - FROM: base:leap15 - PYTHON3: yes - requirements: - PROJECT: requirements - PROJECT_REPO: http://172.17.0.1/git/openstack/requirements - FROM: base:leap15 + # - name: leap15 + # release: master + # buildargs: + # base: + # PACKAGE_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/opensuse/" + # PIP_INDEX_URL: http://{{ zuul_site_mirror_fqdn }}/pypi/simple + # PIP_TRUSTED_HOST: "{{ zuul_site_mirror_fqdn }}" + # project: + # PROJECT: "{{ project }}" + # PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} + # WHEELS: 172.17.0.1:5000/loci/requirements:master-leap15 + # FROM: base:leap15 + # requirements: + # PROJECT: requirements + # PROJECT_REPO: http://172.17.0.1/git/openstack/requirements + # FROM: base:leap15 - name: debian image: debian:stretch release: train buildargs: base: - DEBIAN_URL: http://{{ zuul_site_mirror_fqdn }}/debian/ - DEBIAN_SECURITY_URL: http://{{ zuul_site_mirror_fqdn }}/debian-security/ - DEBIAN_SECURITY_DISTRIBUTION: stretch/updates - CEPH_URL: http://{{ zuul_site_mirror_fqdn }}/ceph-deb-nautilus/ + # Apparently nobody configured the debian mirror yet, commenting + #DEBIAN_URL: http://{{ zuul_site_mirror_fqdn }}/debian/ + #DEBIAN_SECURITY_URL: http://{{ zuul_site_mirror_fqdn }}/debian-security/ + #DEBIAN_SECURITY_DISTRIBUTION: stretch/updates + #CEPH_URL: http://{{ zuul_site_mirror_fqdn }}/ceph-deb-nautilus/ ALLOW_UNAUTHENTICATED: "true" PIP_INDEX_URL: http://{{ zuul_site_mirror_fqdn }}/pypi/simple PIP_TRUSTED_HOST: "{{ zuul_site_mirror_fqdn }}" @@ -113,9 +112,11 @@ distros: PROJECT_RELEASE: "train" WHEELS: 172.17.0.1:5000/loci/requirements:train-debian FROM: base:debian + PYTHON3: no requirements: PROJECT: requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements PROJECT_REF: "stable/train" PROJECT_RELEASE: "train" FROM: base:debian + PYTHON3: no