Airship testing gate updates
Change-Id: I0ac9ff9b23653304b0cc46c8898f7e0df2edc704
This commit is contained in:
parent
fac52adb38
commit
100d178434
18
.zuul.yaml
18
.zuul.yaml
@ -61,7 +61,7 @@
|
||||
post-run:
|
||||
- tools/gate/playbooks/osh-infra-collect-logs.yaml
|
||||
vars:
|
||||
treasuremap_ref: refs/changes/43/927643/7
|
||||
treasuremap_ref: v1.9
|
||||
extra_volume:
|
||||
size: 80G
|
||||
type: Linux
|
||||
@ -78,15 +78,17 @@
|
||||
loopback_device: /dev/loop100
|
||||
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
|
||||
ceph_osd_data_device: /dev/loop100
|
||||
kube_version_repo: "v1.30"
|
||||
kube_version: "1.30.3-1.1"
|
||||
kube_version_repo: "v1.31"
|
||||
kube_version: "1.31.3-1.1"
|
||||
calico_setup: true
|
||||
calico_version: "v3.27.4"
|
||||
cilium_setup: false
|
||||
cilium_version: "1.16.0"
|
||||
flannel_setup: false
|
||||
flannel_version: v0.25.4
|
||||
helm_version: "v3.15.4"
|
||||
metallb_setup: false
|
||||
metallb_version: "0.13.12"
|
||||
helm_version: "v3.14.0"
|
||||
crictl_version: "v1.30.1"
|
||||
zuul_osh_relative_path: ../../openstack/openstack-helm
|
||||
zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra
|
||||
@ -102,10 +104,10 @@
|
||||
parent: armada-operator-base
|
||||
vars:
|
||||
site: airskiff
|
||||
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
||||
HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||
OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||
OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
|
||||
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz
|
||||
HTK_COMMIT: 3a4fb2185dec899a2f77e6ff46a04947ac89cd6c
|
||||
OSH_INFRA_COMMIT: 3a4fb2185dec899a2f77e6ff46a04947ac89cd6c
|
||||
OSH_COMMIT: 450f355bc7dd68c449700c8c5f3ff89d45103474
|
||||
CLONE_ARMADA_OPERATOR: false
|
||||
DISTRO: ubuntu_jammy
|
||||
DOCKER_REGISTRY: localhost:5000
|
||||
|
2
Makefile
2
Makefile
@ -14,7 +14,7 @@ COMMIT ?= $(shell git rev-parse HEAD)
|
||||
PYTHON = python3
|
||||
CHARTS := $(filter-out deps, $(patsubst charts/%/.,%,$(wildcard charts/*/.)))
|
||||
DISTRO ?= ubuntu_jammy
|
||||
DISTRO_ALIAS ?= ubuntu_focal
|
||||
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}
|
||||
UBUNTU_BASE_IMAGE ?=
|
||||
|
Loading…
x
Reference in New Issue
Block a user