Followup opendev cleanup and test jobs

Depends-On: https://review.opendev.org/#/c/653964/
Change-Id: Icdd50ca6f1d4b982ca260ea43aafe95ea1e7d117
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2019-04-19 23:38:26 -05:00
parent 3cbee7c788
commit 4a0dc9e70e
6 changed files with 16 additions and 16 deletions

View File

@ -30,7 +30,7 @@
Base job for StarlingX Flock components DevStack tests Base job for StarlingX Flock components DevStack tests
nodeset: openstack-single-node-bionic nodeset: openstack-single-node-bionic
roles: roles:
- zuul: openstack-infra/devstack - zuul: openstack/devstack
timeout: 9000 timeout: 9000
required-projects: required-projects:
- name: openstack/devstack - name: openstack/devstack
@ -107,8 +107,8 @@
# StarlingX services # StarlingX services
platform-util: true platform-util: true
devstack_plugins: devstack_plugins:
stx-integ: https://git.starlingx.io/stx-integ integ: https://opendev.org/starlingx/integ
stx-update: https://git.starlingx.io/stx-update update: https://opendev.org/starlingx/update
- job: - job:
name: stx-integ-pylint name: stx-integ-pylint

View File

@ -1,5 +1,5 @@
========= =====
stx-integ integ
========= =====
StarlingX Integration StarlingX Integration

View File

@ -6,7 +6,7 @@
echo_summary "stx-integ devstack plugin.sh called: $1/$2" echo_summary "stx-integ devstack plugin.sh called: $1/$2"
# check for service enabled # check for service enabled
if is_service_enabled stx-integ; then if is_service_enabled integ; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
# Perform installation of source # Perform installation of source
echo_summary "Install stx-integ" echo_summary "Install stx-integ"

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Devstack settings # Devstack settings
# This plugin enables StarlingX stx-integ services and follows the # This plugin enables StarlingX integ services and follows the
# DevStack plugin contract: # DevStack plugin contract:
# https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract # https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract
@ -11,15 +11,15 @@
# Defaults # Defaults
# -------- # --------
STX_INTEG_NAME=stx-integ STX_INTEG_NAME=integ
######### Plugin Specific ########## ######### Plugin Specific ##########
enable_service $STX_INTEG_NAME enable_service $STX_INTEG_NAME
# This must not use any variables to work properly in OpenStack's DevStack playbook # This must not use any variables to work properly in OpenStack's DevStack playbook
define_plugin stx-integ define_plugin integ
# This works for Zuul jobs using OpenStack's DevStack roles # This works for Zuul jobs using OpenStack's DevStack roles
plugin_requires stx-integ stx-update plugin_requires integ update
# Initial source of lib script # Initial source of lib script
source $DEST/stx-integ/devstack/lib/stx-integ source $DEST/integ/devstack/lib/integ

View File

@ -86,10 +86,10 @@ commands =
[testenv:pylint] [testenv:pylint]
basepython = python2.7 basepython = python2.7
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
-e{[tox]stxdir}/stx-update/tsconfig/tsconfig -e{[tox]stxdir}/update/tsconfig/tsconfig
-e{[tox]stxdir}/stx-fault/fm-api -e{[tox]stxdir}/fault/fm-api
-e{[tox]stxdir}/stx-config/sysinv/sysinv/sysinv -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
-e{[tox]stxdir}/stx-config/sysinv/cgts-client/cgts-client -e{[tox]stxdir}/config/sysinv/cgts-client/cgts-client
docutils docutils
keyring keyring
libvirt-python libvirt-python