Followup opendev cleanup and test jobs
Depends-On: https://review.opendev.org/653964 Depends-On: https://review.opendev.org/653961 Depends-On: https://review.opendev.org/654013 Change-Id: I78959af02a0183d993b5a5609adb69e5464cc261 Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
parent
55bca6e738
commit
97ce4e8961
|
@ -157,10 +157,10 @@
|
||||||
sysinv-cond: true
|
sysinv-cond: true
|
||||||
tls-proxy: false
|
tls-proxy: false
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
stx-config: https://git.starlingx.io/stx-config
|
config: https://opendev.org/starlingx/config
|
||||||
stx-fault: https://git.starlingx.io/stx-fault
|
fault: https://opendev.org/starlingx/fault
|
||||||
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: cgtsclient-tox-py27
|
name: cgtsclient-tox-py27
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 Wind River Systems, Inc.
|
# Copyright (c) 2019 Wind River Systems, Inc.
|
||||||
#
|
#
|
||||||
# lib/stx-config
|
# lib/config
|
||||||
# Functions to control the configuration and operation of stx-config
|
# Functions to control the configuration and operation of stx-config
|
||||||
|
|
||||||
# Dependencies:
|
# Dependencies:
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
# - ``functions`` file
|
# - ``functions`` file
|
||||||
# - ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined
|
# - ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined
|
||||||
|
|
||||||
# - The stx-update and stx-fault plugins must be enabled
|
# - The update and fault plugins must be enabled
|
||||||
|
|
||||||
# ``stack.sh`` calls the entry points in this order:
|
# ``stack.sh`` calls the entry points in this order:
|
||||||
#
|
#
|
|
@ -10,7 +10,7 @@
|
||||||
echo_summary "sysinv devstack plugin.sh called: $1/$2"
|
echo_summary "sysinv devstack plugin.sh called: $1/$2"
|
||||||
|
|
||||||
# check for service enabled
|
# check for service enabled
|
||||||
if is_service_enabled stx-config; then
|
if is_service_enabled config; then
|
||||||
if [[ "$1" == "stack" && "$2" == "install" ]]; then
|
if [[ "$1" == "stack" && "$2" == "install" ]]; then
|
||||||
# Perform installation of source
|
# Perform installation of source
|
||||||
echo_summary "Installing stx-config"
|
echo_summary "Installing stx-config"
|
||||||
|
|
|
@ -16,16 +16,16 @@
|
||||||
# Defaults
|
# Defaults
|
||||||
# --------
|
# --------
|
||||||
|
|
||||||
STX_CONFIG_NAME=stx-config
|
STX_CONFIG_NAME=config
|
||||||
|
|
||||||
######### Plugin Specific ##########
|
######### Plugin Specific ##########
|
||||||
enable_service $STX_CONFIG_NAME
|
enable_service $STX_CONFIG_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-config
|
define_plugin config
|
||||||
# This works for Zuul jobs using OpenStack's DevStack roles
|
# This works for Zuul jobs using OpenStack's DevStack roles
|
||||||
plugin_requires stx-config stx-integ
|
plugin_requires config integ
|
||||||
plugin_requires stx-config stx-update
|
plugin_requires config update
|
||||||
|
|
||||||
# Handle STX pre-reqs
|
# Handle STX pre-reqs
|
||||||
# stx-integ
|
# stx-integ
|
||||||
|
@ -47,4 +47,4 @@ if is_service_enabled sysinv-agent; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Initial source of lib script
|
# Initial source of lib script
|
||||||
source $DEST/stx-config/devstack/lib/stx-config
|
source $DEST/config/devstack/lib/config
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -4,7 +4,7 @@ minversion = 2.3
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
|
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages}
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_STDOUT_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
OS_STDERR_CAPTURE=1
|
OS_STDERR_CAPTURE=1
|
||||||
|
|
Loading…
Reference in New Issue