airship/shipyard
Code Issues Proposed changes

Preparation for osh-infra merger

Browse Source 
Change-Id: I00cbec47e08ab13fcb7637744f3f23e63b447c53
This commit is contained in:
Sergiy Markin 2025-03-28 22:27:55 -05:00
parent 278e3e5b12
commit edf4d27ed1
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.zuul.yaml
View File

@ -95,7 +95,7 @@
run: tools/gate/playbooks/build-charts.yaml run: tools/gate/playbooks/build-charts.yaml
nodeset: airship-shipyard-single-node-jammy nodeset: airship-shipyard-single-node-jammy
vars: vars:
HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b HTK_COMMIT: master
- job: - job:
name: airship-shipyard-chart-build-latest-htk name: airship-shipyard-chart-build-latest-htk
@ -144,11 +144,11 @@
name: shipyard-base name: shipyard-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
@ -194,9 +194,9 @@
helm_version: "v3.14.0" helm_version: "v3.14.0"
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:
@ -208,9 +208,9 @@
vars: vars:
site: airskiff site: airskiff
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz
HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714 HTK_COMMIT: master
OSH_INFRA_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714 OSH_INFRA_COMMIT: master
OSH_COMMIT: 5a3f2080c12bb56238b150c69a06064c64d61d0f OSH_COMMIT: master
CLONE_SHIPYARD: false CLONE_SHIPYARD: false
DISTRO: ubuntu_jammy DISTRO: ubuntu_jammy
DOCKER_REGISTRY: localhost:5000 DOCKER_REGISTRY: localhost:5000
@ -229,6 +229,7 @@
- ./tools/deployment/airskiff/developer/100-deploy-osh.sh - ./tools/deployment/airskiff/developer/100-deploy-osh.sh
- ./tools/deployment/airskiff/common/os-env.sh - ./tools/deployment/airskiff/common/os-env.sh
- ./tools/gate/wait-for-shipyard.sh - ./tools/gate/wait-for-shipyard.sh
- ./tools/deployment/airskiff/common/get-airflow-worker-logs.sh
# - ./tools/deployment/airskiff/common/sleep.sh # - ./tools/deployment/airskiff/common/sleep.sh
irrelevant-files: *irrelevant-files irrelevant-files: *irrelevant-files
@ -249,7 +250,7 @@
commit: true commit: true
static: static:
- latest - latest
- airflow_2.10.2 - airflow_2.10.4

4
tools/helm_tk.sh
View File

@ -16,8 +16,8 @@
set -eux set -eux
HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"} HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm.git"}
HTK_STABLE_COMMIT=${HTK_COMMIT:-"d0c93b5648704b9d9999412d932f8329c80362c0"} HTK_STABLE_COMMIT=${HTK_COMMIT:-"master"}