openstack
/
loci
Code Issues Proposed changes

Build jammy images 

Change-Id: I639588a618816f6ff70a7736963589977bb36eb1
This commit is contained in:
Vladimir Kozhukalov 2023-07-11 01:24:37 +03:00
parent 7c3c53c375
commit ec70407d68
8 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindep.txt
View File

@ -45,7 +45,8 @@ libjpeg-dev [platform:dpkg requirements]
libjpeg-devel [platform:rpm requirements]
libkrb5-dev [platform:dpkg requirements]
liblapack-dev [platform:dpkg requirements]
libldap-2.4-2 [platform:dpkg (keystone ldap)]
libldap-2.4-2 [platform:dpkg (keystone ldap !jammy)]
libldap-2.5-0 [platform:dpkg (keystone ldap jammy)]
libldap2-dev [platform:dpkg requirements]
libmariadbclient-dev [platform:debian requirements]
libmysqlclient-dev [platform:ubuntu requirements]

23
dockerfiles/ubuntu_jammy/Dockerfile Normal file
View File

@ -0,0 +1,23 @@
ARG FROM=ubuntu:jammy
FROM ${FROM}
ARG UBUNTU_URL=http://archive.ubuntu.com/ubuntu/
ARG CLOUD_ARCHIVE_URL=http://ubuntu-cloud.archive.canonical.com/ubuntu/
ARG CEPH_URL=http://download.ceph.com/debian-reef/
ARG ALLOW_UNAUTHENTICATED=false
ARG PIP_INDEX_URL=https://pypi.python.org/simple/
ARG PIP_TRUSTED_HOST=pypi.python.org
ENV PIP_INDEX_URL=${PIP_INDEX_URL}
ENV PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST}
COPY sources.list /etc/apt/
COPY cloud-archive.gpg ceph.gpg /etc/apt/trusted.gpg.d/
RUN sed -i \
-e "s|%%UBUNTU_URL%%|${UBUNTU_URL}|g" \
-e "s|%%CLOUD_ARCHIVE_URL%%|${CLOUD_ARCHIVE_URL}|g" \
-e "s|%%CEPH_URL%%|${CEPH_URL}|g" \
/etc/apt/sources.list
RUN echo "APT::Get::AllowUnauthenticated \"${ALLOW_UNAUTHENTICATED}\";\n\
Acquire::AllowInsecureRepositories \"${ALLOW_UNAUTHENTICATED}\";\n\
Acquire::AllowDowngradeToInsecureRepositories \"${ALLOW_UNAUTHENTICATED}\";" \
>> /etc/apt/apt.conf.d/allow-unathenticated

BIN
dockerfiles/ubuntu_jammy/ceph.gpg Normal file
View File

Binary file not shown.

BIN
dockerfiles/ubuntu_jammy/cloud-archive.gpg Normal file
View File

Binary file not shown.

6
dockerfiles/ubuntu_jammy/sources.list Normal file
View File

@ -0,0 +1,6 @@
deb %%UBUNTU_URL%% jammy main universe
deb %%UBUNTU_URL%% jammy-updates main universe
deb %%UBUNTU_URL%% jammy-backports main universe
deb %%UBUNTU_URL%% jammy-security main universe
deb %%CEPH_URL%% jammy main
deb %%CLOUD_ARCHIVE_URL%% jammy-updates/antelope main

63
playbooks/vars.yaml
View File

@ -14,23 +14,6 @@ reuse_requirements: False
loci_src_dir: "src/opendev.org/openstack/loci"
distros:
# - name: centos
# image: centos:9-stream
# release: master
# buildargs:
# base:
# PACKAGE_MIRROR: "{{ zuul_site_mirror_fqdn }}"
# 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-centos
# FROM: base:centos
# requirements:
# PROJECT: requirements
# PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
# FROM: base:centos
- name: ubuntu_focal
image: ubuntu:focal
release: master
@ -38,7 +21,7 @@ distros:
base:
UBUNTU_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu/
CLOUD_ARCHIVE_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu-cloud-archive/
CEPH_URL: http://{{ zuul_site_mirror_fqdn }}/ceph-deb-octopus/
CEPH_URL: http://{{ zuul_site_mirror_fqdn }}/ceph-deb-quincy/
ALLOW_UNAUTHENTICATED: "true"
PIP_INDEX_URL: http://{{ zuul_site_mirror_fqdn }}/pypi/simple
PIP_TRUSTED_HOST: "{{ zuul_site_mirror_fqdn }}"
@ -51,27 +34,23 @@ distros:
PROJECT: requirements
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
FROM: base:ubuntu_focal
# - name: ubuntu_bionic
# image: ubuntu:bionic
# release: ussuri
# buildargs:
# base:
# UBUNTU_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu/
# CLOUD_ARCHIVE_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu-cloud-archive/
# 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 }}"
# project:
# PROJECT: "{{ project }}"
# PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
# WHEELS: 172.17.0.1:5000/loci/requirements:ussuri-ubuntu_bionic
# FROM: base:ubuntu_bionic
# PROJECT_REF: "stable/ussuri"
# PROJECT_RELEASE: "ussuri"
# requirements:
# PROJECT: requirements
# PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
# FROM: base:ubuntu_bionic
# PROJECT_REF: "stable/ussuri"
# PROJECT_RELEASE: "ussuri"
- name: ubuntu_jammy
image: ubuntu:jammy
release: master
buildargs:
base:
UBUNTU_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu/
CLOUD_ARCHIVE_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu-cloud-archive/
ALLOW_UNAUTHENTICATED: "true"
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-ubuntu_jammy
FROM: base:ubuntu_jammy
requirements:
PROJECT: requirements
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
FROM: base:ubuntu_jammy

5
scripts/install.sh
View File

@ -5,6 +5,11 @@ set -ex
distro=$(awk -F= '/^ID=/ {gsub(/\"/, "", $2); print $2}' /etc/*release)
export distro=${DISTRO:=$distro}
if [[ ${distro} == "ubuntu" ]]; then
distro_version=$(awk -F= '/^UBUNTU_CODENAME=/ {gsub(/\"/, "", $2); print $2}' /etc/*release)
fi
export distro_version=${DISTRO_VERSION:=$distro_version}
dpkg_python_packages=("python3" "python3-virtualenv")
rpm_python_packages=("python3")

2
scripts/install_packages.sh
View File

@ -3,7 +3,7 @@
set -ex
for file in /opt/loci/bindep*; do
PACKAGES+=($(bindep -f $file -b -l newline ${PROJECT} ${PROFILES} || :))
PACKAGES+=($(bindep -f $file -b -l newline ${PROJECT} ${PROFILES} ${distro_version} || :))
done
if [[ ! -z ${PACKAGES} ]]; then