Airflow stable 2.8.1

Change-Id: I46c97108d50304fd4e3417f6057d999c891b0661

.zuul.yaml

@@ -61,7 +61,7 @@
     run: tools/gate/playbooks/build-charts.yaml
     nodeset: armada-single-node-focal
     vars:
-      HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
+      HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
 
 
 - job:
@@ -105,8 +105,8 @@
       CLONE_ARMADA: false
       ARMADA_IMAGE_DISTRO: ubuntu_focal
       HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz
-      HTK_COMMIT: 1c83e3a9aef8c0b40360a88125f8b11b540dd3a7
+      HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-      OSH_INFRA_COMMIT: 1c83e3a9aef8c0b40360a88125f8b11b540dd3a7
+      OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
       OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
     irrelevant-files:
       - ^.*\.rst$
@@ -131,7 +131,7 @@
           commit: true
         static:
           - latest
-          - airflow_2.6.2
+          - airflow_2.8.1
 
 
 - secret:

armada/utils/source.py

@@ -18,7 +18,7 @@ import tarfile
 import tempfile
 
 from git import exc as git_exc
-from git import Git
+# from git import Git
 from git import Repo
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -89,14 +89,18 @@ def git_clone(repo_url, ref='master', proxy_server=None, auth_method=None):
                 repo_url,
                 temp_dir,
                 env=env_vars,
-                config='http.proxy=%s' % proxy_server)
+                config='http.proxy=%s' % proxy_server,
+                allow_unsafe_options=True)
         else:
             LOG.debug('Cloning [%s]', repo_url)
-            repo = Repo.clone_from(repo_url, temp_dir, env=env_vars)
+            repo = Repo.clone_from(
+                repo_url, temp_dir, env=env_vars, allow_unsafe_options=True)
 
-        repo.remotes.origin.fetch(ref)
+        # Fetch with --config option
-        g = Git(repo.working_dir)
+        repo.remotes.origin.fetch(ref, allow_unsafe_options=True)
-        g.checkout('FETCH_HEAD')
+        # g = Git(repo.working_dir)
+        # Checkout FETCH_HEAD
+        repo.git.checkout('FETCH_HEAD')
     except git_exc.GitCommandError as e:
         LOG.exception('Encountered GitCommandError during clone.')
         if ssh_cmd and ssh_cmd in e.stderr:

requirements-frozen.txt

@@ -1,77 +1,78 @@
-alembic==1.11.1
+alembic==1.13.1
-attrs==23.1.0
+attrs==23.2.0
-bcrypt==4.0.1
+bcrypt==4.1.2
-cachetools==5.3.1
+cachetools==5.3.2
-certifi==2023.5.7
+certifi==2023.11.17
-charset-normalizer==3.1.0
+charset-normalizer==3.3.2
-click==8.1.3
+click==8.1.7
 debtcollector==2.5.0
 decorator==5.1.1
-deepdiff==6.3.1
+deepdiff==6.7.1
-dogpile.cache==1.2.2
+dogpile.cache==1.3.1
-falcon==3.1.1
+falcon==3.1.3
-fixtures==4.1.0
+gitdb==4.0.11
-gitdb==4.0.10
+GitPython==3.1.41
-GitPython==3.1.31
+google-auth==2.26.2
-google-auth==2.20.0
+greenlet==3.0.3
-greenlet==2.0.2
+idna==3.6
-idna==3.4
+importlib-metadata==6.11.0
-importlib-metadata==4.13.0
+importlib-resources==5.13.0
-importlib-resources==5.12.0
+iso8601==2.1.0
-iso8601==2.0.0
+Jinja2==3.1.3
-Jinja2==3.1.2
+jsonschema==4.20.0
-jsonschema==4.17.3
+jsonschema-specifications==2023.12.1
 keystoneauth1==4.3.1
 keystonemiddleware==9.3.0
 kubernetes==23.6.0
-Mako==1.2.4
+Mako==1.3.0
 MarkupSafe==2.1.3
 mock==5.1.0
-msgpack==1.0.5
+msgpack==1.0.7
-netaddr==0.8.0
+netaddr==1.2.1
 netifaces==0.11.0
 oauthlib==3.2.2
 ordered-set==4.1.0
 os-service-types==1.7.0
-oslo.cache==3.4.0
+oslo.cache==3.6.0
 oslo.config==8.6.0
 oslo.context==4.0.0
 oslo.db==11.2.0
-oslo.i18n==6.0.0
+oslo.i18n==6.2.0
 oslo.log==4.8.0
 oslo.middleware==4.4.0
 oslo.policy==3.10.1
 oslo.serialization==4.1.0
 oslo.utils==4.12.3
-packaging==21.3
+packaging==23.2
-Paste==3.5.3
+Paste==3.7.1
-PasteDeploy==3.0.1
+PasteDeploy==3.1.0
-pbr==5.11.1
+pbr==6.0.0
-pip==23.1.2
+pip==23.2.1
 pkgutil_resolve_name==1.3.10
-prometheus-client==0.17.0
+prometheus-client==0.19.0
 py==1.11.0
-pyasn1==0.4.8
+pyasn1==0.5.1
-pyasn1-modules==0.2.8
+pyasn1-modules==0.3.0
 pycadf==3.1.1
 pylibyaml==0.1.0
-pyparsing==3.0.9
+pyparsing==3.1.1
-pyrsistent==0.19.3
 python-dateutil==2.8.2
-python-keystoneclient==5.1.0
+python-keystoneclient==5.3.0
-python-memcached==1.59
+python-memcached==1.62
-pytz==2023.3
+pytz==2023.3.post1
-PyYAML==6.0
+PyYAML==6.0.1
+referencing==0.32.1
 requests==2.31.0
 requests-oauthlib==1.3.1
-responses==0.23.1
+responses==0.24.1
 retry==0.9.2
 rfc3986==1.5.0
+rpds-py==0.17.1
 rsa==4.9
-setuptools==67.7.2
+setuptools==68.2.2
 six==1.16.0
-smmap==5.0.0
+smmap==5.0.1
-SQLAlchemy==1.4.48
+SQLAlchemy==1.4.51
 sqlalchemy-migrate==0.13.0
 sqlparse==0.4.4
 statsd==4.0.1
@@ -79,13 +80,12 @@ stevedore==5.1.0
 Tempita==0.5.2
 testresources==2.0.1
 testscenarios==0.5.0
-testtools==2.6.0
+testtools==2.7.1
-types-PyYAML==6.0.12.10
+typing_extensions==4.9.0
-typing_extensions==4.6.3
+urllib3==1.26.18
-urllib3==1.26.16
+uWSGI==2.0.24
-uWSGI==2.0.22
 WebOb==1.8.7
-websocket-client==1.5.3
+websocket-client==1.7.0
-wheel==0.40.0
+wheel==0.41.2
-wrapt==1.15.0
+wrapt==1.16.0
-zipp==3.15.0
+zipp==3.17.0

tox.ini

@@ -38,7 +38,7 @@ allowlist_externals=
   sh
 deps=
   -r{toxinidir}/requirements-direct.txt
-  -c https://raw.githubusercontent.com/apache/airflow/constraints-2.6.2/constraints-3.8.txt
+  -c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.1/constraints-3.8.txt
 commands=
   rm -f requirements-frozen.txt
   sh -c "pip freeze --all | grep -vE 'armada|pyinotify|pkg-resources==0.0.0' > requirements-frozen.txt"