openstack
/
trove
Code Issues Proposed changes

Merge "Retire TripleO: remove the TripleO jobs/ref" into stable/zed

This commit is contained in:
Zuul 2024-04-03 08:13:00 +00:00 committed by Gerrit Code Review
parent c8225f4463 d679322163
commit 794e58e740
7 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -8,7 +8,7 @@ trove.egg*
.eggs/ .eggs/
trove/vcsversion.py trove/vcsversion.py
*py*.egg *py*.egg
.coverage.* .coverage
coverage.xml coverage.xml
cover/ cover/
dist/ dist/

4
devstack/settings
View File

@ -14,10 +14,6 @@ TROVE_DASHBOARD_DIR=${TROVE_DASHBOARD_DIR:-${DEST}/trove-dashboard}
TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${GIT_BASE}/openstack/trove-dashboard.git} TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${GIT_BASE}/openstack/trove-dashboard.git}
TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-stable/zed} TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-stable/zed}
TRIPLEO_IMAGES_DIR=${TRIPLEO_IMAGES_DIR:-${DEST}/tripleo-image-elements}
TRIPLEO_IMAGES_REPO=${TRIPLEO_IMAGES_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
TRIPLEO_IMAGES_BRANCH=${TRIPLEO_IMAGES_BRANCH:-stable/zed}
# Set up configuration directory and files # Set up configuration directory and files
TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove} TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove}
TROVE_CONF=${TROVE_CONF:-${TROVE_CONF_DIR}/trove.conf} TROVE_CONF=${TROVE_CONF:-${TROVE_CONF_DIR}/trove.conf}

2
integration/scripts/functions
View File

@ -305,7 +305,7 @@ function git_checkout() {
if [ -n "$REPO_BRANCH" ]; then if [ -n "$REPO_BRANCH" ]; then
pushd "$REPO_DIR" pushd "$REPO_DIR"
if [ $PROJECT == "diskimage-builder" ] || [ $PROJECT == "tripleo-image-elements" ]; then if [ $PROJECT == "diskimage-builder" ]; then
REPO_BRANCH=master REPO_BRANCH=master
fi fi
CURRENT_BRANCH=$(git branch | grep "\*" | awk '{print $2}') CURRENT_BRANCH=$(git branch | grep "\*" | awk '{print $2}')

1
integration/scripts/image-projects-list
View File

@ -1,2 +1 @@
diskimage-builder diskimage-builder
tripleo-image-elements

1
integration/scripts/trovestack
View File

@ -262,7 +262,6 @@ function install_prep_packages() {
#pkg_install git-core kvm-ipxe gettext #pkg_install git-core kvm-ipxe gettext
pkg_install git-core gettext pkg_install git-core gettext
fi fi
sudo -H $HTTP_PROXY pip install --upgrade pip dib-utils
} }
function install_devstack_code() { function install_devstack_code() {

4
zuul.d/jobs.yaml
View File

@ -6,7 +6,6 @@
required-projects: required-projects:
- openstack/tempest - openstack/tempest
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/tripleo-image-elements
- openstack/trove - openstack/trove
- openstack/trove-dashboard - openstack/trove-dashboard
vars: vars:
@ -408,7 +407,6 @@
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/trove - openstack/trove
- openstack/tripleo-image-elements
- job: - job:
name: trove-ubuntu-guest-image-build name: trove-ubuntu-guest-image-build
@ -419,7 +417,6 @@
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/trove - openstack/trove
- openstack/tripleo-image-elements
files: files:
- ^integration/(scripts|tests)/ - ^integration/(scripts|tests)/
vars: vars:
@ -439,7 +436,6 @@
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/trove - openstack/trove
- openstack/tripleo-image-elements
files: files:
- ^integration/(scripts|tests)/ - ^integration/(scripts|tests)/
vars: vars:

9
zuul.d/projects.yaml
View File

@ -41,7 +41,10 @@
periodic: periodic:
jobs: jobs:
- publish-trove-guest-image-ubuntu-focal: - publish-trove-guest-image-ubuntu-focal:
branches: ^(?!stable/.*).*$ branches:
regex: ^stable/.*$
negate: true
- publish-trove-guest-image-ubuntu-focal-dev: - publish-trove-guest-image-ubuntu-focal-dev:
branches: ^(?!stable/.*).*$ branches:
regex: ^stable/.*$
negate: true