From 725c7eb546b7e307b9396e7678623a8f0516421b Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Sat, 5 Oct 2024 14:34:35 +0000
Subject: [PATCH] Airflow 2.10.2 fixes

Also fixed readthedocs publishing

Change-Id: I550599285866f7fd3868902f0fdd92d7d96def2c
---
 .readthedocs.yaml                     |  6 +++++-
 .zuul.yaml                            | 14 ++++++++------
 doc/source/_static/armada.conf.sample | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 9fd229d9..05b89471 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -17,9 +17,13 @@ sphinx:
 formats:
   - pdf
 
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.10"
+
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.8
   install:
     - requirements: doc/requirements.txt
     - requirements: requirements-frozen.txt
diff --git a/.zuul.yaml b/.zuul.yaml
index 5daf4421..e0609215 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,11 +13,14 @@
 - project:
     templates:
       - openstack-cover-jobs
-
+      - docs-on-readthedocs
+    vars:
+      rtd_webhook_id: '47578'
+      rtd_project_name: 'airship-armada'
     check:
       jobs:
         - openstack-tox-py310
-        - openstack-tox-docs
+        # - openstack-tox-docs
         - openstack-tox-pep8
         - armada-chart-build-gate
         - armada-chart-build-latest-htk
@@ -27,7 +30,7 @@
     gate:
       jobs:
         - openstack-tox-py310
-        - openstack-tox-docs
+        # - openstack-tox-docs
         - openstack-tox-pep8
         - armada-chart-build-gate
         - armada-docker-build-gate-ubuntu_jammy
@@ -117,7 +120,7 @@
     post-run:
       - tools/gate/playbooks/osh-infra-collect-logs.yaml
     vars:
-      treasuremap_ref: refs/changes/43/927643/4
+      treasuremap_ref: v1.9
       extra_volume:
         size: 80G
         type: Linux
@@ -162,7 +165,6 @@
       HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
       OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
       OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
-      TREASUREMAP_COMMIT: refs/changes/43/927643/4
       CLONE_ARMADA: false
       DISTRO: ubuntu_jammy
       DOCKER_REGISTRY: localhost:5000
@@ -200,7 +202,7 @@
           commit: true
         static:
           - latest
-          - airflow_2.10.0
+          - airflow_2.10.2
 
 
 - secret:
diff --git a/doc/source/_static/armada.conf.sample b/doc/source/_static/armada.conf.sample
index bf7e3802..fc983069 100644
--- a/doc/source/_static/armada.conf.sample
+++ b/doc/source/_static/armada.conf.sample
@@ -52,6 +52,14 @@
 # Minimum value: 0
 #lock_expiration = 600
 
+# Determines whether the operator has to be enabled         to apply charts
+# instead of armada-api itself (boolean value)
+#enable_operator = false
+
+# Determines whether the wait process has to be done         via armada-go
+# using client-go library (boolean value)
+#go_wait = false
+
 #
 # From oslo.log
 #
@@ -321,7 +329,7 @@
 # Domain name containing project (string value)
 #project_domain_name = <None>
 
-# Trust ID (string value)
+# ID of the trust to use as a trustee use (string value)
 #trust_id = <None>
 
 # Optional domain ID to use with v3 and v2 parameters. It will be used for both
@@ -532,6 +540,9 @@
 # middleware should parse the headers or not. (boolean value)
 #enable_proxy_headers_parsing = false
 
+# HTTP basic auth password file. (string value)
+#http_basic_auth_user_file = /etc/htpasswd
+
 
 [oslo_policy]