airship/porthole
Code Issues Proposed changes

Porthole updates

Browse Source 
This PS makes the follofing changes:
- adds iproute2 package to compute-utility
- kubectl updated to 1.27.4 in focal images
- if available - mounts 80Gb volume in zuul nodes for docker and
  containerd
- runs local docker registry and let's containerd to pull locally built
  images for tests

Change-Id: I09faace44f68bf0d75a6f4272006cb36e02314d4
This commit is contained in:
Sergiy Markin 2023-08-17 16:48:51 +00:00
parent 8c69a118df
commit bd95b13d2b
23 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
calicoctl_utility: quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_bionic calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_bionic
... ...

2
charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
calicoctl_utility: quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_focal calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_focal
... ...

2
charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
ceph_utility: quay.io/airshipit/porthole-ceph-utility:latest-ubuntu_bionic ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_bionic
... ...

2
charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
ceph_utility: quay.io/airshipit/porthole-ceph-utility:latest-ubuntu_focal ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_focal
... ...

2
charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
compute_utility: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_bionic compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_bionic
... ...

2
charts/compute-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
compute_utility: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_focal
... ...

2
charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
etcdctl_utility: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_bionic etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_bionic
... ...

2
charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
etcdctl_utility: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_focal
... ...

2
charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
mysqlclient_utility: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_bionic
... ...

2
charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
mysqlclient_utility: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_focal
... ...

2
charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
openstack_utility: quay.io/airshipit/porthole-openstack-utility:latest-ubuntu_bionic openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_bionic
... ...

2
charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
openstack_utility: quay.io/airshipit/porthole-openstack-utility:latest-ubuntu_focal openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_focal
... ...

2
charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
postgresql_utility: quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_bionic
... ...

2
charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
postgresql_utility: quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_focal postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_focal
... ...

2
images/ceph-utility/Dockerfile.ubuntu_focal
View File

@ -11,7 +11,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
# Quincy 12.2.5 # Quincy 12.2.5
ARG CEPH_RELEASE=quincy ARG CEPH_RELEASE=quincy
ARG CEPH_RELEASE_TAG=17.2.6-1focal ARG CEPH_RELEASE_TAG=17.2.6-1focal
ARG KUBE_VERSION=1.27.1 ARG KUBE_VERSION=1.27.4
ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-quincy/ ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-quincy/
ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-quincy/release.asc ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-quincy/release.asc

3
images/compute-utility/Dockerfile.ubuntu_focal
View File

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \ org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.27.1 ARG KUBE_VERSION=1.27.4
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -24,6 +24,7 @@ RUN set -xe \
gnupg \ gnupg \
hexedit \ hexedit \
iperf \ iperf \
iproute2 \
jq \ jq \
moreutils \ moreutils \
radosgw \ radosgw \

2
images/etcdctl-utility/Dockerfile.ubuntu_focal
View File

@ -9,7 +9,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ARG ETCDCTL_VERSION=v3.5.6 ARG ETCDCTL_VERSION=v3.5.6
ARG KUBE_VERSION=1.27.1 ARG KUBE_VERSION=1.27.4
ENV GOOGLE_URL=https://storage.googleapis.com/etcd ENV GOOGLE_URL=https://storage.googleapis.com/etcd
ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download

2
images/mysqlclient-utility/Dockerfile.ubuntu_focal
View File

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \ org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.27.1 ARG KUBE_VERSION=1.27.4
RUN set -xe \ RUN set -xe \
&& export DEBIAN_FRONTEND=noninteractive \ && export DEBIAN_FRONTEND=noninteractive \

2
images/postgresql-utility/Dockerfile.ubuntu_focal
View File

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \ org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.27.1 ARG KUBE_VERSION=1.27.4
RUN set -xe \ RUN set -xe \
&& export DEBIAN_FRONTEND=noninteractive \ && export DEBIAN_FRONTEND=noninteractive \

26
tools/deployment/004-make-images.sh
View File

@ -13,5 +13,29 @@
set -x set -x
: "${DISTRO="ubuntu_focal"}"
env env
make images make images
docker rm registry --force || true
docker run -d -p 5000:5000 --restart=always --name registry registry:2
docker tag quay.io/airshipit/porthole-calicoctl-utility:latest-${DISTRO} localhost:5000/porthole-calicoctl-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-ceph-utility:latest-${DISTRO} localhost:5000/porthole-ceph-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-compute-utility:latest-${DISTRO} localhost:5000/porthole-compute-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-etcdctl-utility:latest-${DISTRO} localhost:5000/porthole-etcdctl-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-mysqlclient-utility:latest-${DISTRO} localhost:5000/porthole-mysqlclient-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-openstack-utility:latest-${DISTRO} localhost:5000/porthole-openstack-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-postgresql-utility:latest-${DISTRO} localhost:5000/porthole-postgresql-utility:latest-${DISTRO}
docker push localhost:5000/porthole-calicoctl-utility:latest-${DISTRO}
docker push localhost:5000/porthole-ceph-utility:latest-${DISTRO}
docker push localhost:5000/porthole-compute-utility:latest-${DISTRO}
docker push localhost:5000/porthole-etcdctl-utility:latest-${DISTRO}
docker push localhost:5000/porthole-mysqlclient-utility:latest-${DISTRO}
docker push localhost:5000/porthole-openstack-utility:latest-${DISTRO}
docker push localhost:5000/porthole-postgresql-utility:latest-${DISTRO}

10
tools/gate/playbooks/airship-porthole-gate-runner.yaml
View File

@ -24,6 +24,16 @@
set -x set -x
./tools/deployment/000-install-packages.sh ./tools/deployment/000-install-packages.sh
./tools/deployment/002-build-charts.sh ./tools/deployment/002-build-charts.sh
sudo fdisk --list
df -h
sudo mkdir -p /opt/ext_vol
BIG_VOLUME=$(sudo fdisk -l 2>&1 | grep -E 80G | grep Linux | awk '{print $1}')
if ! mount | grep "${BIG_VOLUME}"
then
sudo mkfs.ext4 "${BIG_VOLUME}"
sudo mount "${BIG_VOLUME}" /opt/ext_vol
df -h
fi
./tools/deployment/003-deploy-k8s.sh ./tools/deployment/003-deploy-k8s.sh
./tools/deployment/004-make-images.sh ./tools/deployment/004-make-images.sh
args: args:

1
tools/gate/playbooks/docker-image-build.yaml
View File

@ -58,7 +58,6 @@
executable: pip3 executable: pip3
become: True become: True
- name: Make images - name: Make images
when: not publish when: not publish
block: block:

2
tools/helm_install.sh
View File

@ -17,7 +17,7 @@
set -x set -x
HELM=$1 HELM=$1
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.11.1-linux-amd64.tar.gz"} HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz"}
function install_helm_binary { function install_helm_binary {