From 24a0b03ae21725df7ccfdd9cd35295125b06e88f Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Sat, 3 Apr 2021 20:18:04 +0100 Subject: [PATCH] 21.04 libraries freeze for charms on master branch * charm-helpers sync for classic charms * build.lock file for reactive charms * ensure tox.ini is from release-tools * ensure requirements.txt files are from release-tools * On reactive charms: - ensure stable/21.04 branch for charms.openstack - ensure stable/21.04 branch for charm-helpers Also fix expected workload status message for cs:ubuntu. Change-Id: I598dfd7216f73f4e3e01471a8de5db66427d889b Co-authored-by: Aurelien Lourot --- src/build.lock | 130 ++++++++++++++++++++++++++++++++++++++ src/test-requirements.txt | 4 +- src/tests/tests.yaml | 8 +++ src/wheelhouse.txt | 4 +- test-requirements.txt | 2 +- tox.ini | 7 +- 6 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 src/build.lock diff --git a/src/build.lock b/src/build.lock new file mode 100644 index 0000000..f490b7d --- /dev/null +++ b/src/build.lock @@ -0,0 +1,130 @@ +{ + "locks": [ + { + "type": "layer", + "item": "layer:options", + "url": "https://github.com/juju-solutions/layer-options.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56" + }, + { + "type": "layer", + "item": "layer:basic", + "url": "https://github.com/juju-solutions/layer-basic.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "623e69c7b432456fd4364f6e1835424fd6b5425e" + }, + { + "type": "layer", + "item": "pacemaker-remote", + "url": null, + "vcs": null, + "branch": "refs/heads/master", + "commit": "0acc7bdb8daae158692b8e494378270cf7a150ec" + }, + { + "type": "layer", + "item": "interface:pacemaker-remote", + "url": "https://github.com/openstack/charm-interface-pacemaker-remote.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "87dc3baa2145286ac5372a01bf9e260f257d3673" + }, + { + "type": "python_module", + "package": "charms.openstack", + "url": "git+https://opendev.org/openstack/charms.openstack.git", + "branch": "refs/heads/stable/21.04", + "version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1", + "vcs": "git" + }, + { + "type": "python_module", + "package": "netaddr", + "vcs": null, + "version": "0.7.19" + }, + { + "type": "python_module", + "package": "pbr", + "vcs": null, + "version": "5.5.1" + }, + { + "type": "python_module", + "package": "setuptools", + "vcs": null, + "version": "41.6.0" + }, + { + "type": "python_module", + "package": "Jinja2", + "vcs": null, + "version": "2.10.1" + }, + { + "type": "python_module", + "package": "pip", + "vcs": null, + "version": "18.1" + }, + { + "type": "python_module", + "package": "pyaml", + "vcs": null, + "version": "20.4.0" + }, + { + "type": "python_module", + "package": "MarkupSafe", + "vcs": null, + "version": "1.1.1" + }, + { + "type": "python_module", + "package": "charmhelpers", + "url": "git+https://github.com/juju/charm-helpers.git", + "branch": "refs/heads/stable/21.04", + "version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6", + "vcs": "git" + }, + { + "type": "python_module", + "package": "wheel", + "vcs": null, + "version": "0.33.6" + }, + { + "type": "python_module", + "package": "charms.reactive", + "vcs": null, + "version": "1.4.1" + }, + { + "type": "python_module", + "package": "Tempita", + "vcs": null, + "version": "0.5.2" + }, + { + "type": "python_module", + "package": "PyYAML", + "vcs": null, + "version": "5.2" + }, + { + "type": "python_module", + "package": "setuptools_scm", + "vcs": null, + "version": "1.17.0" + }, + { + "type": "python_module", + "package": "six", + "vcs": null, + "version": "1.15.0" + } + ] +} \ No newline at end of file diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 520681e..eb4844b 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -11,5 +11,5 @@ charm-tools>=2.4.4 keyring<21 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) -git+https://github.com/openstack-charmers/zaza.git#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/21.04#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index bca4044..a00162d 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -9,6 +9,14 @@ gate_bundles: - groovy-basic smoke_bundles: - bionic-basic +target_deploy_status: + # NOTE(lourot): cs:ubuntu has now an empty status message when ready: + api: + workload-status: active + workload-status-message: '' + compute: + workload-status: active + workload-status-message: '' tests_options: force_deploy: - groovy-basic diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 9131674..3dd59f3 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,4 +1,4 @@ -git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack +git+https://opendev.org/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack -git+https://github.com/juju/charm-helpers.git#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 3f08524..16bbc27 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6' nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack # # Revisit for removal / mock improvement: netifaces # vault diff --git a/tox.ini b/tox.ini index ce79fa1..391b2af 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,12 @@ deps = [testenv:build] basepython = python3 commands = - charm-build --log-level DEBUG -o {toxinidir}/build/builds src {posargs} + charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs} + +[testenv:add-build-lock-file] +basepython = python3 +commands = + charm-build --log-level DEBUG --write-lock-file -o {toxinidir}/build/builds src {posargs} [testenv:py3] basepython = python3