From ec70407d68c433863aadcd2b19a65862e0976b88 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Tue, 11 Jul 2023 01:24:37 +0300
Subject: [PATCH] Build jammy images

Change-Id: I639588a618816f6ff70a7736963589977bb36eb1
---
 bindep.txt                                 |   3 +-
 dockerfiles/ubuntu_jammy/Dockerfile        |  23 ++++++++
 dockerfiles/ubuntu_jammy/ceph.gpg          | Bin 0 -> 1143 bytes
 dockerfiles/ubuntu_jammy/cloud-archive.gpg | Bin 0 -> 2235 bytes
 dockerfiles/ubuntu_jammy/sources.list      |   6 ++
 playbooks/vars.yaml                        |  63 +++++++--------------
 scripts/install.sh                         |   5 ++
 scripts/install_packages.sh                |   2 +-
 8 files changed, 58 insertions(+), 44 deletions(-)
 create mode 100644 dockerfiles/ubuntu_jammy/Dockerfile
 create mode 100644 dockerfiles/ubuntu_jammy/ceph.gpg
 create mode 100644 dockerfiles/ubuntu_jammy/cloud-archive.gpg
 create mode 100644 dockerfiles/ubuntu_jammy/sources.list

diff --git a/bindep.txt b/bindep.txt
index f5c3d2f..895697f 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -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]
diff --git a/dockerfiles/ubuntu_jammy/Dockerfile b/dockerfiles/ubuntu_jammy/Dockerfile
new file mode 100644
index 0000000..41acc55
--- /dev/null
+++ b/dockerfiles/ubuntu_jammy/Dockerfile
@@ -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
diff --git a/dockerfiles/ubuntu_jammy/ceph.gpg b/dockerfiles/ubuntu_jammy/ceph.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..c5d8bd399481b290ab5da94b87bd860a33a998ee
GIT binary patch
literal 1143
zcmV--1c>{Y0u2OJ_=X7q5CF@nevbJ;Y5AM5al>VI3*qGa#K5Hwm2!_RG#_465sD38
zmXL=NLCNO`29zsUcXOrn|9+`WxR5h*eY-hs=XvlKgzqt0XNxo>!;HCEyQjioviTGX
z^63AwMTc%);z$XmJLkgYyK`nM1CAhp7WF|reYxYAEUs_~4Q5B}26ndxL?Y|$Cver?
z+Ak9m`<d^l{Op;q?v`5?I6je_$6Trtv1Oa-YcCFZ;=akh1yv3#IE=v-BVy&lP83n#
z`^Q;Afa@!8X~5iAbYbjZj1>0ngIQ{q$*^Y!*xlNj-t_r%K}ODaaT?*Dqdu%y^KW0`
zS6ZrG;)BP!1)?WS`!>M&$0zQz>J5}1&X7`S)dDqhl(43rss_qx06btgIkE2bedIgK
z;xG~&^jzqnT9NUuM4z@q&^f(3x^B&MdjnVbuzE8k)(4)w_9NhYi0H9|H7&%3I2aEb
zh+q>nquudzb_uOvKITzY;vyJtM-HU~wRly1j%tlK+D;M`D%KzpMT}47p0{w%J|&ag
z`%O4cbnWhhSU^G^3k166X92k`)Mx`N5%~SD@}t(xyk<&8q|`J0Q(hA}UIj{x-8%<|
z0)_&zqy<O4=l2|^!W(5j4orY9J6;~&)$>lwwJA`^hL=$>tqdyAJt<5pl;fJECl3s|
zLE5}_)s5UcL0JG10RRECDnn&(Xf9)KZ6GLeWo%_(b7dfFWqBzeJac7Zb#iHRc|c=j
zaA+=LZ*4w_0yqQ{0RjLb1p-z0h6w^20|pBT2nPcK1{DYb2?`4Y76JnS0v-VZ7k~f?
z2@vQ?!oWrkIh0+}5CD%DJ;qE0XK&-rYVa)amGnqOoyNcMzwjac5aBU$X%%PBW>k6L
z3D6G=<^q??a9MD*mjZ4qFl~`Thg{o{=i*$KoW(gzrFN}Hzst1V_~#iu<t&*AqN+xh
z)C2NxYDVx>>_a{YPUJt&wDrHV^U72%DSq=FIzI>(lJk(k^-4(U`{P77CyD0%bq>ih
zZBB+Kwrh5L1y&6*F39>os1BoYq>c-<=+D;}#zj`0g9`;rl3rwz((Gm4pRg-QOdCnE
z{s#VPSsvu@5RJh(cGcL-DgN-d^tmU(lfkmllZx7il#QT<VBUkfy{ZinL7g4rYJqBt
zP1_g}44w%_xC8P9n27AMV9w<I#_6LeGFIM0cwn4NHH)<uIf%$sY0CC{_kAx1Whn^g
zh-nvDiGCUBlXiZv_iOvX#1m?W*nb4?gL@y34e~fntOfHqT#nusXKP+V$;~kz!}5rj
zO+~zi1bCI9CJ!#aOBb}KmZFYj0HtcVQ9A|t&(LoRpmD`Ci5_UKOAO}kOk{ou{$WNd
zGo`ihmo&Br=srxh3g^l#0kB?PV@tZeM`FI$YObw=U5}r(>WeuJ+xp#6a@O21agV0i
zaTeo!x%2r>B-Too>JJHr2)h%LYsHAn939f>LsAFu<W)uk&$1wA1mb^?h?g5=u{}iN
Jj6sf82Y|NF7#08k

literal 0
HcmV?d00001

diff --git a/dockerfiles/ubuntu_jammy/cloud-archive.gpg b/dockerfiles/ubuntu_jammy/cloud-archive.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..f9029620c8cd0579d412f2558193ef6c64d31885
GIT binary patch
literal 2235
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
JZ^+P~d$$mNKYRcH

literal 0
HcmV?d00001

diff --git a/dockerfiles/ubuntu_jammy/sources.list b/dockerfiles/ubuntu_jammy/sources.list
new file mode 100644
index 0000000..c0e561b
--- /dev/null
+++ b/dockerfiles/ubuntu_jammy/sources.list
@@ -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
diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml
index 7c066ec..ef749fc 100644
--- a/playbooks/vars.yaml
+++ b/playbooks/vars.yaml
@@ -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
+
diff --git a/scripts/install.sh b/scripts/install.sh
index be3bd19..96ffd18 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -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")
 
diff --git a/scripts/install_packages.sh b/scripts/install_packages.sh
index 23d17c4..baf3a5b 100755
--- a/scripts/install_packages.sh
+++ b/scripts/install_packages.sh
@@ -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