diff options
| author | Zuul <zuul@review.opendev.org> | 2025-10-13 22:54:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-10-13 22:54:32 +0000 |
| commit | c087c246944ba35d1836272a89a649d95d968b7b (patch) | |
| tree | 2d7938c567989949de3868661625373f46cf9bfd /tests | |
| parent | 6bd76a1a9e6e4ebed582f677361323d02c4f0d46 (diff) | |
| parent | 0a3e2210016b138ef4f3fadc1e3b4babbee78bd7 (diff) | |
| download | kolla-ansible-c087c246944ba35d1836272a89a649d95d968b7b.tar.gz kolla-ansible-c087c246944ba35d1836272a89a649d95d968b7b.zip | |
Merge "CI: rework upgrade.sh to Ansible role"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run.yml | 10 | ||||
| -rwxr-xr-x | tests/upgrade.sh | 32 |
2 files changed, 2 insertions, 40 deletions
diff --git a/tests/run.yml b/tests/run.yml index 1108ae6a4..aa1ca4dbf 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -725,14 +725,8 @@ --final /etc/kolla/passwords.yml # Perform an upgrade to the in-development code. - - name: Run upgrade.sh script - shell: - cmd: tests/upgrade.sh - executable: /bin/bash - chdir: "{{ kolla_ansible_src_dir }}" - environment: - KOLLA_ANSIBLE_VENV_PATH: "{{ kolla_ansible_venv_path }}" - SCENARIO: "{{ scenario }}" + - import_role: + name: kolla-ansible-upgrade - import_role: name: kolla-ansible-test-dashboard diff --git a/tests/upgrade.sh b/tests/upgrade.sh deleted file mode 100755 index eeea9d818..000000000 --- a/tests/upgrade.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -set -o xtrace -set -o errexit - -# Enable unbuffered output for Ansible in Jenkins. -export PYTHONUNBUFFERED=1 - - -function upgrade { - RAW_INVENTORY=/etc/kolla/inventory - - source $KOLLA_ANSIBLE_VENV_PATH/bin/activate - - kolla-ansible certificates -i ${RAW_INVENTORY} -vvv &> /tmp/logs/ansible/certificates - # Previous versions had older docker, requests requirements for example - # Therefore we need to run bootstrap again to ensure libraries are in - # proper versions (ansible-collection-kolla is different for new version, potentionally - # also dependencies). - kolla-ansible bootstrap-servers -i ${RAW_INVENTORY} -vvv &> /tmp/logs/ansible/upgrade-bootstrap - kolla-ansible prechecks -i ${RAW_INVENTORY} -vvv &> /tmp/logs/ansible/upgrade-prechecks - - kolla-ansible pull -i ${RAW_INVENTORY} -vvv &> /tmp/logs/ansible/pull-upgrade - kolla-ansible upgrade -i ${RAW_INVENTORY} -vvv &> /tmp/logs/ansible/upgrade - - kolla-ansible post-deploy -i ${RAW_INVENTORY} -vvv &> /tmp/logs/ansible/upgrade-post-deploy - - kolla-ansible validate-config -i ${RAW_INVENTORY} -vvv &> /tmp/logs/ansible/validate-config -} - - -upgrade |