Preparation for osh-infra merger

Change-Id: Idfc8e99dde60097812950c99b62d9bd3b66ed4cc
This commit is contained in:
Sergiy Markin 2025-03-28 23:26:04 -05:00
parent 071c3d41f1
commit 43d22f5938
2 changed files with 12 additions and 9 deletions

3
.gitignore vendored
View File

@ -84,6 +84,9 @@ celerybeat-schedule
# dotenv # dotenv
.env .env
# devcontainers
.devcontainer/
# virtualenv # virtualenv
.venv .venv
venv/ venv/

View File

@ -140,11 +140,11 @@
name: pegleg-base name: pegleg-base
abstract: true abstract: true
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: airship/kubernetes-entrypoint
- zuul: openstack/openstack-helm
- zuul: zuul/zuul-jobs - zuul: zuul/zuul-jobs
required-projects: required-projects:
- name: openstack/openstack-helm - name: openstack/openstack-helm
- name: openstack/openstack-helm-infra
- name: openstack/openstack-helm-plugin - name: openstack/openstack-helm-plugin
- name: airship/treasuremap - name: airship/treasuremap
override-checkout: v1.9 override-checkout: v1.9
@ -183,8 +183,8 @@
loopback_device: /dev/loop100 loopback_device: /dev/loop100
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
ceph_osd_data_device: /dev/loop100 ceph_osd_data_device: /dev/loop100
kube_version_repo: "v1.30" kube_version_repo: "v1.32"
kube_version: "1.30.3-1.1" kube_version: "1.32.1-1.1"
calico_setup: true calico_setup: true
calico_version: "v3.27.4" calico_version: "v3.27.4"
cilium_setup: false cilium_setup: false
@ -194,9 +194,9 @@
helm_version: "v3.15.4" helm_version: "v3.15.4"
crictl_version: "v1.30.1" crictl_version: "v1.30.1"
zuul_osh_relative_path: ../../openstack/openstack-helm zuul_osh_relative_path: ../../openstack/openstack-helm
zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra zuul_osh_infra_relative_path: ../../openstack/openstack-helm
zuul_treasuremap_relative_path: ../../airship/treasuremap zuul_treasuremap_relative_path: ../../airship/treasuremap
gate_scripts_relative_path: ../../openstack/openstack-helm-infra gate_scripts_relative_path: ../../openstack/openstack-helm
run_helm_tests: "no" run_helm_tests: "no"
- job: - job:
@ -211,9 +211,9 @@
vars: vars:
site: airskiff site: airskiff
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b HTK_COMMIT: master
OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b OSH_INFRA_COMMIT: master
OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203 OSH_COMMIT: master
DISTRO: ubuntu_jammy DISTRO: ubuntu_jammy
DOCKER_REGISTRY: localhost:5000 DOCKER_REGISTRY: localhost:5000
MAKE_PEGLEG_IMAGES: true MAKE_PEGLEG_IMAGES: true