Followup opendev cleanup and test jobs
Depends-on: https://review.opendev.org/654006 Change-Id: If679cd0742cdf53b27db5f9c94b4c705c46b07ef Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
parent
227e1c5754
commit
0a0475b815
|
@ -47,5 +47,5 @@
|
||||||
sw-patch: true
|
sw-patch: true
|
||||||
tsconfig: true
|
tsconfig: 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
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# lib/stx-update
|
# lib/update
|
||||||
|
|
||||||
# ``stack.sh`` calls the entry points in this order:
|
# ``stack.sh`` calls the entry points in this order:
|
||||||
#
|
#
|
||||||
|
@ -18,7 +18,7 @@ set -o xtrace
|
||||||
# Defaults
|
# Defaults
|
||||||
# --------
|
# --------
|
||||||
|
|
||||||
STXUPDATE_REPO=${STXUPDATE_REPO:-${GIT_BASE}/openstack/stx-update.git}
|
STXUPDATE_REPO=${STXUPDATE_REPO:-${GIT_BASE}/starlingx/update.git}
|
||||||
STXUPDATE_DIR=${GITDIR[$STX_UPDATE_NAME]}
|
STXUPDATE_DIR=${GITDIR[$STX_UPDATE_NAME]}
|
||||||
|
|
||||||
STX_PATCH_DIR=$STXUPDATE_DIR/cgcs-patch/
|
STX_PATCH_DIR=$STXUPDATE_DIR/cgcs-patch/
|
|
@ -6,7 +6,7 @@
|
||||||
echo_summary "stx-update devstack plugin.sh called: $1/$2"
|
echo_summary "stx-update devstack plugin.sh called: $1/$2"
|
||||||
|
|
||||||
# check for service enabled
|
# check for service enabled
|
||||||
if is_service_enabled stx-update; then
|
if is_service_enabled update; 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-update"
|
echo_summary "Install stx-update"
|
||||||
|
|
|
@ -12,15 +12,15 @@
|
||||||
# Defaults
|
# Defaults
|
||||||
# --------
|
# --------
|
||||||
|
|
||||||
STX_UPDATE_NAME=stx-update
|
STX_UPDATE_NAME=update
|
||||||
|
|
||||||
######### Plugin Specific ##########
|
######### Plugin Specific ##########
|
||||||
enable_service $STX_UPDATE_NAME
|
enable_service $STX_UPDATE_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-update
|
define_plugin update
|
||||||
# This works for Zuul jobs using OpenStack's DevStack roles
|
# This works for Zuul jobs using OpenStack's DevStack roles
|
||||||
#plugin_requires stx-update stx-xxxx
|
#plugin_requires update xxxx
|
||||||
|
|
||||||
# Initial source of lib script
|
# Initial source of lib script
|
||||||
source $DEST/stx-update/devstack/lib/stx-update
|
source $DEST/update/devstack/lib/update
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -116,8 +116,8 @@ commands = {[testenv]commands}
|
||||||
[testenv:pylint]
|
[testenv:pylint]
|
||||||
deps = {[testenv]deps}
|
deps = {[testenv]deps}
|
||||||
pylint
|
pylint
|
||||||
-e{toxinidir}/../stx-config/sysinv/sysinv/sysinv
|
-e{toxinidir}/../config/sysinv/sysinv/sysinv
|
||||||
-e{toxinidir}/../stx-fault/fm-api
|
-e{toxinidir}/../fault/fm-api
|
||||||
pyCrypto
|
pyCrypto
|
||||||
daemon
|
daemon
|
||||||
keystoneauth1
|
keystoneauth1
|
||||||
|
|
|
@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install {opts} {packages}
|
install_command = pip install {opts} {packages}
|
||||||
|
|
||||||
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt}
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue