diff --git a/.zuul.yaml b/.zuul.yaml index 04ea6b8b..08600c6c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,23 +3,45 @@ - openstack-cover-jobs - openstack-lower-constraints-jobs - check-requirements - - openstack-python3-ussuri-jobs + - openstack-python3-victoria-jobs - publish-openstack-docs-pti check: jobs: - - karbor-dsvm-fullstack: + - karbor-fullstack: voting: false - job: - name: karbor-dsvm-fullstack - parent: legacy-dsvm-base - run: playbooks/legacy/karbor-dsvm-fullstack/run.yaml - post-run: playbooks/legacy/karbor-dsvm-fullstack/post.yaml + name: karbor-fullstack + parent: devstack-tox-functional timeout: 7800 required-projects: - - openstack/devstack-gate - - openstack/karbor - - openstack/python-karborclient - - openstack/trove - - openstack/trove-dashboard - - openstack/manila-tempest-plugin + - opendev.org/openstack/karbor + - opendev.org/openstack/python-karborclient + - opendev.org/openstack/trove + - opendev.org/openstack/trove-dashboard + - opendev.org/openstack/manila-tempest-plugin + vars: + devstack_plugins: + karbor: https://opendev.org/openstack/karbor + trove: https://opendev.org/openstack/trove + trove-dashboard: https://opendev.org/openstack/trove-dashboard + manila-tempest-plugin: https://opendev.org/openstack/manila-tempest-plugin + tox_envlist: fullstack + devstack_local_conf: + test-config: + $SWIFT_CONFIG_PROXY_SERVER: + DEFAULT: + workers: 4 + $CINDER_CONF: + DEFAULT: + osapi_volume_workers: 8 + rpc_response_timeout: 120 + $KARBOR_API_CONF: + DEFAULT: + max_window_time: 150 + min_window_time: 75 + min_interval: 300 + devstack_services: + karbor-api: True + karbor-protection: True + karbor-operationengine: True diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 0e0b29b9..beb48c45 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -116,7 +116,7 @@ function configure_karbor { # generate configuration file cd $KARBOR_DIR - tox -e genconfig + oslo-config-generator --config-file etc/oslo-config-generator/karbor.conf --output-file etc/karbor.conf.sample cp etc/karbor.conf.sample etc/karbor.conf cp $KARBOR_DIR/etc/karbor.conf $KARBOR_CONF diff --git a/playbooks/legacy/karbor-dsvm-fullstack/post.yaml b/playbooks/legacy/karbor-dsvm-fullstack/post.yaml deleted file mode 100644 index 5f4a3293..00000000 --- a/playbooks/legacy/karbor-dsvm-fullstack/post.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.stestr/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*stestr.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/karbor-dsvm-fullstack/run.yaml b/playbooks/legacy/karbor-dsvm-fullstack/run.yaml deleted file mode 100644 index 30f554f8..00000000 --- a/playbooks/legacy/karbor-dsvm-fullstack/run.yaml +++ /dev/null @@ -1,88 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-karbor-dsvm-fullstack from old job gate-karbor-dsvm-fullstack-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[post-config|$SWIFT_CONFIG_PROXY_SERVER]] - [DEFAULT] - workers=4 - - [[post-config|$CINDER_CONF]] - [DEFAULT] - osapi_volume_workers=8 - rpc_response_timeout=120 - - [[post-config|$KARBOR_API_CONF]] - [DEFAULT] - max_window_time=150 - min_window_time=75 - min_interval=300 - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_GATE_USE_PYTHON3=True - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PROJECTS="openstack/karbor $PROJECTS" - export PROJECTS="openstack/trove $PROJECTS" - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT="python-karborclient" - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/karbor/devstack/devstackgaterc - - function gate_hook { - bash -xe $BASE/new/karbor/karbor/tests/contrib/gate_hook.sh fullstack - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/karbor/karbor/tests/contrib/post_test_hook.sh fullstack - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}'