Noble image updates

Change-Id: Iaf85ff6dcd475366e1f60f4b1eeaa7674e502b9c Signed-off-by: Sergiy Markin <smarkin@mirantis.com>
2026-01-21 20:43:39 +00:00
parent ae4bc880b9
commit df760ba7c4
12 changed files with 162 additions and 126 deletions
@@ -24,6 +24,7 @@
      docker_registry_login_url: "https://quay.io/api/v1/"
      deb_docker_repo: "{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }}"
      image_prefix: "airshipit"
+      base_image_noble: "quay.io/airshipit/ubuntu:noble"
      base_image_jammy: "quay.io/airshipit/ubuntu:jammy"
      base_image_focal: "ubuntu:20.04"
      base_image_bionic: "ubuntu:18.04"
@@ -31,34 +32,34 @@
      base_image_xenial: "ubuntu:16.04"
    check:
      jobs:
-        - openstack-tox-py310
-        - openstack-tox-pep8-jammy
-        - openstack-tox-cover-jammy
+        - openstack-tox-py312
+        - openstack-tox-pep8-noble
+        - openstack-tox-cover-noble
        - pegleg-dependency-vulnerability-check
-        - airship-pegleg-validate-airskiff-manifests-jammy
-        - airship-pegleg-docker-build-gate-ubuntu_jammy
+        - airship-pegleg-validate-airskiff-manifests-noble
+        - airship-pegleg-docker-build-gate-ubuntu_noble
        - airship-pegleg-lint-yaml

    gate:
      jobs:
-        - openstack-tox-py310
-        - openstack-tox-pep8-jammy
-        - openstack-tox-cover-jammy
+        - openstack-tox-py312
+        - openstack-tox-pep8-noble
+        - openstack-tox-cover-noble
        - pegleg-dependency-vulnerability-check
-        - airship-pegleg-validate-airskiff-manifests-jammy
-        - airship-pegleg-docker-build-gate-ubuntu_jammy
+        - airship-pegleg-validate-airskiff-manifests-noble
+        - airship-pegleg-docker-build-gate-ubuntu_noble
        - airship-pegleg-lint-yaml
    post:
      jobs:
-        - airship-pegleg-docker-publish-ubuntu_jammy
+        - airship-pegleg-docker-publish-ubuntu_noble
        - pegleg-upload-git-mirror
        - trigger-readthedocs-webhook

 - nodeset:
-    name: airship-pegleg-single--bionic
+    name: airship-pegleg-single-node-noble
    nodes:
      - name: primary
-        label: ubuntu-bionic
+        label: ubuntu-noble

 - nodeset:
    name: airship-pegleg-single-node-jammy
@@ -67,15 +68,15 @@
        label: ubuntu-jammy

 - job:
-    name: openstack-tox-pep8-jammy
+    name: openstack-tox-pep8-noble
    parent: openstack-tox-pep8
-    nodeset: openstack-single-node-jammy
+    nodeset: openstack-single-node-noble


 - job:
-    name: openstack-tox-cover-jammy
+    name: openstack-tox-cover-noble
    parent: openstack-tox-cover
-    nodeset: openstack-single-node-jammy
+    nodeset: openstack-single-node-noble


 - job:
@@ -83,41 +84,41 @@
    voting: true
    timeout: 600
    run: tools/gate/playbooks/lint-yaml.yaml
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
    irrelevant-files:
      - ^.*\.rst$
      - ^doc/.*$

 - job:
    name: pegleg-dependency-vulnerability-check
-    parent: tox-py310
+    parent: tox-py312
    voting: false
    timeout: 600
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
    vars:
      tox_envlist: safety
-      bindep_profile: test py310
+      bindep_profile: test py312

 - job:
-    name: airship-pegleg-docker-build-gate-ubuntu_jammy
+    name: airship-pegleg-docker-build-gate-ubuntu_noble
    timeout: 7200
    run: tools/gate/playbooks/docker-image-build.yaml
-    nodeset: airship-pegleg-single-node-jammy
+    nodeset: airship-pegleg-single-node-noble
    irrelevant-files:
      - '^doc/.*'
    vars:
      publish: false
-      distro: ubuntu_jammy
+      distro: ubuntu_noble
      tags:
        dynamic:
          patch_set: true

 - job:
-    name: airship-pegleg-validate-airskiff-manifests-jammy
+    name: airship-pegleg-validate-airskiff-manifests-noble
    description: |
      Test pegleg Airskiff site manifest validation
    parent: treasuremap-airskiff-infra-deploy-base
-    nodeset: treasuremap-airskiff-1node-ubuntu_jammy
+    nodeset: treasuremap-airskiff-1node-ubuntu_noble
    run:
      - tools/gate/playbooks/airship-run-scripts.yaml
      - tools/gate/playbooks/airskiff-validate.yaml
@@ -131,7 +132,7 @@
      CLONE_PEGLEG: false
      MAKE_PEGLEG_IMAGES: true
      USE_ARMADA_GO: false
-      DISTRO: ubuntu_jammy
+      DISTRO: ubuntu_noble
      DOCKER_REGISTRY: localhost:5000
      gate_scripts_relative_path: ../../airship/treasuremap
      gate_scripts:
@@ -140,17 +141,17 @@
        - ./tools/deployment/airskiff/developer/022-generate_security_keys.sh

 - job:
-    name: airship-pegleg-docker-publish-ubuntu_jammy
+    name: airship-pegleg-docker-publish-ubuntu_noble
    timeout: 7200
    run: tools/gate/playbooks/docker-image-build.yaml
-    nodeset: airship-pegleg-single-node-jammy
+    nodeset: airship-pegleg-single-node-noble
    secrets:
      - airship_pegleg_quay_creds_2026
    irrelevant-files:
      - '^doc/.*'
    vars:
      publish: true
-      distro: ubuntu_jammy
+      distro: ubuntu_noble
      tags:
        dynamic:
          branch: true
@@ -159,32 +160,6 @@
          - latest
          - airflow_3.1.5

- secret:
-    name: airship_pegleg_quay_creds
-    data:
-      username: !encrypted/pkcs1-oaep
-        - BI1sCnCyps8RaXf/BQ2ZtobrXn4MfnimRr5wE5Rv3U95NCCK5EoUwBEvnz7yNmQ8m99D7
-          9Gx4qA0N1ry7QL+o2Ll0D/ahb/HsaVBNU3CeVfe+3shpEVEuSi2xrA8K9LQPfIK1237vr
-          wVvN/R+y/uYm7mpPr/aEPjQwJf3wgEK8xV/ZTvqYSVCpGylbfV0tWxm6uEVdBc1kMPLJN
-          8uItJPaAaYMkFEasnVlI/DV8suiK13BLT7bNpNZBQsQ3AlcBCoq9mt50C3slV1wIneaz9
-          qK+O++z7r8OTWUDMQqWE5d1m6jz1WIp5DROmnOvb9dfS73XsTcgmXwilrQt3VSvFCToga
-          gAVHcoWbIKfxgrbOhoLFr+68id3VwVKN+NXgkoxTAJSzFCWwrs0X4n4W6D4O9buQyFTiZ
-          s9o5rB1f2bdF5iI8Npqg6YchPtWn2eR78w1hRyge2HJk2RQgN1CqjpbiQ0uiEy0QA/Ksu
-          VTtuONyV3T7FUYXaK3cHYrCwhV/idquSNRCWnKQAbs8mU8w298UbpOq4lZk1Njeg9StIs
-          0DYyG1SX2k4mBS4//9i488qBSss2CBMhZWHbesSDi/OW4fNzz/2wm2FaW1uaJJSOTXEyJ
-          E3p4+eejcYknXR+XD6BWfSvSwabsCezGSCg7wg7CRFsuTYXx5a4y/+P8Jh+Y7Y=
-      password: !encrypted/pkcs1-oaep
-        - x/0RHX1OlOfFgyb5ed0sknZQi8waSQLzWv+Aog0CziVMf9r3MtZ29LAcrqp9VUdFRYGCk
-          Hf71TJb1Zb8b+WNcUJH2JjVo//Z1smU5F5xEqzhz0gTm1HYQjMAlqd1VNDYv0IpWl2dLE
-          sGnEOT/Uq0RfH3rRt+33GagmXBUNuOIMdx41ubrMaF6ddg8IbjISRaCdfPOlNIrj24gCj
-          a16UNiSyAhvqkod2G2HO7JE7Nv2//5hI1MD1o7sip8/eub12XtHMjpDRKR+KymX81LGAS
-          PeCAn+Hw41uUKnxI/OTW47YtNvQVZZ4gRTOKTumsSNSceFfbf5ljm/JHTWx0SO6Z/kvzH
-          RAJwBmLPHg7leD2wF9vWXwcmlyWJFyeEW/K/+6gYycQ2H0OnRuRxzYaNpSa96zPWUfNsA
-          3TEKJcXjFXJSr00KnWmUZw8ZmPYAziu+pZoBXpkIhYoP1MAtggv/pvVsODDHmokP9nVE6
-          s6YbtUXzthM/TgsE5KMZ2QP4udetj11RGDC+7fz/edtLcrpL3Nrq2rkJ2tRV+yR1ElKGx
-          b2YX7cwM/vx3DPhWRBPJJfOoSRl+ZJByDM1KKWmAB91LT9vB3oVk/vq2XUsbTH2w20LcK
-          xBXFJMtVHOavHIIWM7qHvkvZzWSBON7ydspje9MbYtTS5/97ccdLxDHA0MX0wM=
-
 - secret:
    name: airship_pegleg_quay_creds_2026
    data:
@@ -222,54 +197,6 @@
        secret: pegleg-airshipit-github-ed25519-secret-2026-01-13
        pass-to-parent: true

- secret:
-    name: pegleg-airshipit-github-secret-2023-03-23
-    data:
-      user: git
-      host: github.com
-      host_key: github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
-      ssh_key: !encrypted/pkcs1-oaep
-        - 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
-
 - secret:
    name: pegleg-airshipit-github-ed25519-secret-2026-01-13
    data:
@@ -27,7 +27,7 @@ PUSH_IMAGE        ?= false
 # use this variable for image labels added in internal build process
 LABEL             ?= org.airshipit.build=community
 COMMIT            ?= $(shell git rev-parse HEAD)
-DISTRO             ?= ubuntu_jammy
+DISTRO             ?= ubuntu_noble
 DISTRO_ALIAS	   ?= ubuntu_jammy
 IMAGE             ?= $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)-${DISTRO}
 IMAGE_ALIAS              := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}-${DISTRO_ALIAS}
@@ -0,0 +1,98 @@
+#
+# In order to fix rate limit error
+#
+# 429 Too Many Requests - Server message: too many requests:
+#   You have reached your pull rate limit.
+#   You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit
+ARG FROM=quay.io/airshipit/ubuntu:noble
+FROM ${FROM}
+ARG CFSSLURL=
+
+LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'
+LABEL org.opencontainers.image.url='https://airshipit.org'
+LABEL org.opencontainers.image.documentation='https://airship-pegleg.readthedocs.org'
+LABEL org.opencontainers.image.source='https://opendev.org/airship/pegleg'
+LABEL org.opencontainers.image.vendor='The Airship Authors'
+LABEL org.opencontainers.image.licenses='Apache-2.0'
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
+ARG DECKHAND_VERSION=branch/master
+ARG SHIPYARD_VERSION=branch/master
+ARG PROMENADE_VERSION=branch/master
+
+RUN set -ex \
+    && apt update -qq \
+    && apt upgrade -y \
+    && apt install -y --no-install-recommends \
+         ca-certificates \
+         curl \
+         gettext-base \
+         gpg \
+         gpg-agent \
+         netbase \
+         openssh-client \
+         python3-dev \
+         python3-setuptools \
+         # this will install golang-cfssl 1.2.0 in Jammy
+         golang-cfssl \
+    && apt autoremove -yqq --purge \
+    && apt clean \
+    && rm -rf \
+         /tmp/* \
+         /usr/share/doc \
+         /usr/share/doc-base \
+         /usr/share/man \
+         /var/lib/apt/lists/* \
+         /var/log/* \
+         /var/tmp/* \
+    && rm -rf /root/.cache/pip
+
+
+
+VOLUME /var/pegleg
+WORKDIR /var/pegleg
+
+COPY requirements-frozen.txt /opt/pegleg/requirements.txt
+RUN set -ex \
+        && buildDeps=' \
+        automake \
+        gcc \
+        libffi-dev \
+        libpq-dev \
+        libssl-dev \
+        libtool \
+        libyaml-dev \
+        libvirt-dev \
+        make \
+        python3-pip \
+        pkg-config \
+        ' \
+        && apt-get -qq update \
+        # Keep git separate so it's not removed below
+        && apt-get install -y $buildDeps git --no-install-recommends \
+        && python3 -m pip install -U pip --break-system-packages --ignore-installed \
+        && pip3 install -r https://opendev.org/airship/deckhand/raw/${DECKHAND_VERSION}/requirements-frozen.txt --break-system-packages \
+        && pip3 install -r https://opendev.org/airship/promenade/raw/${PROMENADE_VERSION}/requirements-frozen.txt --break-system-packages \
+        && pip3 install -r https://opendev.org/airship/shipyard/raw/${SHIPYARD_VERSION}/src/bin/shipyard_client/requirements-frozen.txt --break-system-packages \
+        && pip3 install --no-cache-dir -r /opt/pegleg/requirements.txt --break-system-packages \
+        && apt-get purge -y --auto-remove $buildDeps \
+        && apt-get autoremove -yqq --purge \
+        && apt-get clean \
+        && rm -rf \
+            /var/lib/apt/lists/* \
+            /tmp/* \
+            /var/tmp/* \
+            /usr/share/man \
+            /usr/share/doc \
+            /usr/share/doc-base
+
+COPY . /opt/pegleg
+RUN pip3 install -e /opt/pegleg --use-pep517 --break-system-packages
+
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+CMD ["pegleg", "--help"]
@@ -199,7 +199,7 @@ def _try_git_clone(
    ssh_cmd = env_vars.get('GIT_SSH_COMMAND')

    try:
-        if proxy_server:
+        if proxy_server and proxy_server.strip():
            LOG.debug('Cloning [%s] with proxy [%s]', repo_url, proxy_server)
            # TODO(felipemonteiro): proxy_server can be finicky. Need a config
            # option to retry up to N times.
@@ -13,7 +13,7 @@
 # limitations under the License.

 from collections import OrderedDict
-from datetime import datetime
+from datetime import datetime, timezone
 import logging

 from pegleg import config
@@ -108,7 +108,7 @@ class PeglegManagedSecretsDocument(object):

        if generated:
            doc['data'][GENERATED] = {
-                'at': datetime.utcnow().isoformat(),
+                'at': datetime.now(timezone.utc).isoformat(),
                'by': author,
                'specifiedBy': {
                    'repo': git.repo_url(config.get_site_repo()),
@@ -170,7 +170,7 @@ class PeglegManagedSecretsDocument(object):

    def set_encrypted(self, author=None):
        """Mark the pegleg managed document as encrypted."""
-        self.data[ENCRYPTED] = {'at': datetime.utcnow().isoformat()}
+        self.data[ENCRYPTED] = {'at': datetime.now(timezone.utc).isoformat()}
        if author:
            self.data[ENCRYPTED]['by'] = author

@@ -1,3 +1,6 @@
 [pytest]
 filterwarnings =
    ignore::pytest.PytestUnraisableExceptionWarning
+    ignore::DeprecationWarning:oslo_utils.eventletutils
+    ignore::DeprecationWarning:oslo_utils.importutils
+    ignore::DeprecationWarning:promenade.renderer
@@ -11,9 +11,9 @@ psycopg2-binary
 pytz

 # Airship dependencies
-deckhand @ git+https://opendev.org/airship/deckhand.git@83adc3a1f54f9c38099d67f95f11fd76b65dfee2#egg=deckhand
-shipyard-client @ git+https://opendev.org/airship/shipyard.git@525a1992ededc6fe210cea5ef92f0eafe544707d#egg=shipyard-client&subdirectory=src/bin/shipyard_client
-promenade @ git+https://opendev.org/airship/promenade.git@ca8f103c641a902f1ba2115326c90ef1b815158b#egg=promenade
+deckhand @ git+https://opendev.org/airship/deckhand.git@5924c5806670141606e78b8b156546d15825d6ef#egg=deckhand
+shipyard-client @ git+https://opendev.org/airship/shipyard.git@497e3c15e9a05cf41978d1983f6e4d1ddf0975b6#egg=shipyard-client&subdirectory=src/bin/shipyard_client
+promenade @ git+https://opendev.org/airship/promenade.git@74443011a752616adab410846e9380db4a5ade59#egg=promenade


 # Openstack Epoxy 2025.1
@@ -17,7 +17,7 @@ cliff==4.13.1
 cmd2==2.7.0
 cryptography==42.0.8
 debtcollector==3.0.0
-Deckhand @ git+https://opendev.org/airship/deckhand.git@83adc3a1f54f9c38099d67f95f11fd76b65dfee2
+Deckhand @ git+https://opendev.org/airship/deckhand.git@5924c5806670141606e78b8b156546d15825d6ef
 decorator==5.2.1
 deepdiff==8.6.1
 dnspython==2.8.0
@@ -56,7 +56,7 @@ mdurl==0.1.2
 microversion_parse==2.1.0
 msgpack==1.1.2
 netaddr==1.3.0
-networkx==3.4.2
+networkx==3.6.1
 oauthlib==3.3.1
 orderly-set==5.5.0
 os-service-types==1.8.2
@@ -82,10 +82,10 @@ PasteDeploy==3.1.0
 PasteScript==3.7.0
 pbr==7.0.3
 pecan==1.7.0
-pip==24.3.1
+pip==24.0
 ply==3.11
 prettytable==3.17.0
-promenade @ git+https://opendev.org/airship/promenade.git@ca8f103c641a902f1ba2115326c90ef1b815158b
+promenade @ git+https://opendev.org/airship/promenade.git@74443011a752616adab410846e9380db4a5ade59
 prometheus_client==0.23.1
 psutil==7.1.3
 psycopg2-binary==2.9.11
@@ -118,8 +118,8 @@ Routes==2.5.1
 rpds-py==0.30.0
 rsa==4.9.1
 selector==0.10.1
-setuptools==75.8.0
-shipyard_client @ git+https://opendev.org/airship/shipyard.git@525a1992ededc6fe210cea5ef92f0eafe544707d#subdirectory=src/bin/shipyard_client
+setuptools==80.9.0
+shipyard_client @ git+https://opendev.org/airship/shipyard.git@497e3c15e9a05cf41978d1983f6e4d1ddf0975b6#subdirectory=src/bin/shipyard_client
 simplejson==3.20.2
 six==1.17.0
 smmap==5.0.2
@@ -130,7 +130,6 @@ testresources==2.0.2
 testscenarios==0.5.0
 testtools==2.8.2
 tiddlyweb==2.4.3
-tomli==2.3.0
 typing_extensions==4.15.0
 tzdata==2025.2
 urllib3==2.6.2
@@ -140,7 +139,6 @@ wcwidth==0.2.14
 WebOb==1.8.9
 websocket-client==1.9.0
 Werkzeug==2.2.3
-wheel==0.45.1
 wrapt==1.17.3
 xattr==0.9.6
 yappi==1.7.3
@@ -107,6 +107,10 @@ def test_git_clone_behind_proxy(mock_log):
    commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d'

    for proxy_server in test_utils.get_proxies()[1].values():
+        # Skip empty or None proxy values
+        if not proxy_server or not proxy_server.strip():
+            continue
+
        git_dir = git.git_handler(url, commit, proxy_server=proxy_server)
        _validate_git_clone(git_dir, commit)

@@ -36,6 +36,11 @@
        - debug:
            msg: "{{ tags | to_json }}"

+    - name: Set ubuntu noble base image
+      set_fact:
+        base_image: "{{ base_image_noble }}"
+      when: distro == 'ubuntu_noble'
+
    - name: Set ubuntu jammy base image
      set_fact:
        base_image: "{{ base_image_jammy }}"
@@ -73,6 +78,7 @@
        - pip:
            name: docker
            executable: pip3
+            break_system_packages: yes
      become: True

    - name: Make images - verbosive
@@ -1,5 +1,5 @@
 [tox]
-envlist = py310,pep8,docs,cover
+envlist = py312,pep8,docs,cover
 minversion = 2.38.0
 skipsdist = True

@@ -32,7 +32,7 @@ commands =
  bash -c "{toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'"


-[testenv:py310]
+[testenv:py312]
 allowlist_externals =
  bash
  find
@@ -101,7 +101,7 @@ allowlist_externals=
  sh
 deps=
  -r{toxinidir}/requirements-direct.txt
-  -c https://raw.githubusercontent.com/apache/airflow/constraints-3.1.5/constraints-3.10.txt
+  -c https://raw.githubusercontent.com/apache/airflow/constraints-3.1.5/constraints-3.12.txt
 commands=
  rm -f {toxinidir}/requirements-frozen.txt
  sh -c "pip freeze --all | grep -vE 'pegleg|pyinotify|pkg-resources' > requirements-frozen.txt"
@@ -1,3 +1,3 @@
-DECKHAND_VERSION=commit/83adc3a1f54f9c38099d67f95f11fd76b65dfee2
-SHIPYARD_VERSION=commit/525a1992ededc6fe210cea5ef92f0eafe544707d
-PROMENADE_VERSION=commit/ca8f103c641a902f1ba2115326c90ef1b815158b
+DECKHAND_VERSION=commit/5924c5806670141606e78b8b156546d15825d6ef
+SHIPYARD_VERSION=commit/497e3c15e9a05cf41978d1983f6e4d1ddf0975b6
+PROMENADE_VERSION=commit/74443011a752616adab410846e9380db4a5ade59