diff --git a/.gitignore b/.gitignore index 345e61a..0fb60a8 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,6 @@ com_crashlytics_export_strings.xml crashlytics.properties crashlytics-build.properties fabric.properties + +# devcontainer +.devcontainer/ \ No newline at end of file diff --git a/roles/airship-run-script-set/defaults/main.yaml b/roles/airship-run-script-set/defaults/main.yaml index c465774..ec3b450 100644 --- a/roles/airship-run-script-set/defaults/main.yaml +++ b/roles/airship-run-script-set/defaults/main.yaml @@ -16,13 +16,15 @@ kubeadm: pod_network_cidr: "10.244.0.0/24" osh_params: container_distro_name: ubuntu - container_distro_version: focal + container_distro_version: jammy +osh_values_overrides_path: "../openstack-helm/values_overrides" +osh_infra_values_overrides_path: "../openstack-helm/values_overrides" # feature_gates: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz -HTK_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 -OSH_INFRA_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 -OSH_COMMIT: 176b412072969f982386db9560b6f50fcb7e0148 +HTK_COMMIT: master +OSH_INFRA_COMMIT: master +OSH_COMMIT: master COREDNS_VERSION: v1.11.1 DISTRO: ubuntu_jammy DOCKER_REGISTRY: quay.io diff --git a/roles/airship-run-script-set/tasks/main.yaml b/roles/airship-run-script-set/tasks/main.yaml index fc13268..4fa81ca 100644 --- a/roles/airship-run-script-set/tasks/main.yaml +++ b/roles/airship-run-script-set/tasks/main.yaml @@ -27,20 +27,25 @@ POD_NETWORK_CIDR: "{{ kubeadm.pod_network_cidr }}" zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" + OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm/') }}" + OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm/') }}" + DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}" OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}" + OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm/') }}" + OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}" + OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}" OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}" CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" - FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" + FEATURES: "{{ osh_params.feature_gates | default('') | regex_replace(',', ' ') }} {{ osh_params.openstack_release | default('') }} {{ osh_params.container_distro_name | default('') }}_{{ osh_params.container_distro_version | default('') }} {{ osh_params.container_distro_name | default('') }}" RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" PL_SITE: "{{ site | default('airskiff') }}" HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz') }}" - HTK_COMMIT: "{{ HTK_COMMIT | default('6ca83be78013446540b68fd28d0a75d5b2329f40') }}" - OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('6ca83be78013446540b68fd28d0a75d5b2329f40') }}" - OSH_COMMIT: "{{ OSH_COMMIT | default('176b412072969f982386db9560b6f50fcb7e0148') }}" + HTK_COMMIT: "{{ HTK_COMMIT | default('master') }}" + OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('master') }}" + OSH_COMMIT: "{{ OSH_COMMIT | default('master') }}" COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}" - DISTRO: "{{ DISTRO | default('ubuntu_jammy') }}" + DISTRO: "{{ DISTRO | default('ubuntu_focal') }}" DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}" CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}" CLONE_ARMADA_GO: "{{ CLONE_ARMADA_GO | default('true') }}" diff --git a/roles/airship-run-script/defaults/main.yaml b/roles/airship-run-script/defaults/main.yaml index ca67190..ec3b450 100644 --- a/roles/airship-run-script/defaults/main.yaml +++ b/roles/airship-run-script/defaults/main.yaml @@ -16,17 +16,18 @@ kubeadm: pod_network_cidr: "10.244.0.0/24" osh_params: container_distro_name: ubuntu - container_distro_version: focal + container_distro_version: jammy +osh_values_overrides_path: "../openstack-helm/values_overrides" +osh_infra_values_overrides_path: "../openstack-helm/values_overrides" # feature_gates: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz -HTK_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 -OSH_INFRA_COMMIT: 6ca83be78013446540b68fd28d0a75d5b2329f40 -OSH_COMMIT: 176b412072969f982386db9560b6f50fcb7e0148 +HTK_COMMIT: master +OSH_INFRA_COMMIT: master +OSH_COMMIT: master COREDNS_VERSION: v1.11.1 DISTRO: ubuntu_jammy DOCKER_REGISTRY: quay.io - CLONE_ARMADA: true CLONE_ARMADA_GO: true CLONE_ARMADA_OPERATOR: true diff --git a/roles/airship-run-script/tasks/main.yaml b/roles/airship-run-script/tasks/main.yaml index c80966d..f58c4a8 100644 --- a/roles/airship-run-script/tasks/main.yaml +++ b/roles/airship-run-script/tasks/main.yaml @@ -24,20 +24,25 @@ POD_NETWORK_CIDR: "{{ kubeadm.pod_network_cidr }}" zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" + OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}" + OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm') }}" + DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}" OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}" + OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm/') }}" + OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}" + OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}" OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}" CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" - FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" + FEATURES: "{{ osh_params.feature_gates | default('') | regex_replace(',', ' ') }} {{ osh_params.openstack_release | default('') }} {{ osh_params.container_distro_name | default('') }}_{{ osh_params.container_distro_version | default('') }} {{ osh_params.container_distro_name | default('') }}" RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" PL_SITE: "{{ site | default('airskiff') }}" HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz') }}" - HTK_COMMIT: "{{ HTK_COMMIT | default('6ca83be78013446540b68fd28d0a75d5b2329f40') }}" - OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('6ca83be78013446540b68fd28d0a75d5b2329f40') }}" - OSH_COMMIT: "{{ OSH_COMMIT | default('176b412072969f982386db9560b6f50fcb7e0148') }}" + HTK_COMMIT: "{{ HTK_COMMIT | default('master') }}" + OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('master') }}" + OSH_COMMIT: "{{ OSH_COMMIT | default('master') }}" COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}" - DISTRO: "{{ DISTRO | default('ubuntu_jammy') }}" + DISTRO: "{{ DISTRO | default('ubuntu_focal') }}" DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}" CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}" CLONE_ARMADA_GO: "{{ CLONE_ARMADA_GO | default('true') }}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 7d91462..a336015 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -35,11 +35,10 @@ name: airship-kubernetes-entrypoint-base abstract: true roles: - - zuul: openstack/openstack-helm-infra + - zuul: openstack/openstack-helm - zuul: zuul/zuul-jobs required-projects: - name: openstack/openstack-helm - - name: openstack/openstack-helm-infra - name: openstack/openstack-helm-plugin - name: airship/treasuremap override-checkout: v1.9 @@ -78,8 +77,8 @@ loopback_device: /dev/loop100 loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" ceph_osd_data_device: /dev/loop100 - kube_version_repo: "v1.31" - kube_version: "1.31.3-1.1" + kube_version_repo: "v1.32" + kube_version: "1.32.1-1.1" calico_setup: true calico_version: "v3.27.4" cilium_setup: false @@ -91,9 +90,9 @@ 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 + zuul_osh_infra_relative_path: ../../openstack/openstack-helm 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" - job: @@ -105,9 +104,9 @@ vars: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz - HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714 - OSH_INFRA_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714 - OSH_COMMIT: 5a3f2080c12bb56238b150c69a06064c64d61d0f + HTK_COMMIT: master + OSH_INFRA_COMMIT: master + OSH_COMMIT: master CLONE_KUBERNETES_ENTRYPOINT: false DISTRO: ubuntu_jammy DOCKER_REGISTRY: localhost:5000 @@ -128,6 +127,7 @@ - ./tools/deployment/airskiff/developer/100-deploy-osh.sh - ./tools/deployment/airskiff/common/os-env.sh - ./tools/gate/wait-for-shipyard.sh + - ./tools/deployment/airskiff/common/get-airflow-worker-logs.sh irrelevant-files: *irrelevant-files