Retire TripleO: remove the TripleO jobs/ref
TripleO is retired so removing its jobs/ref - https://review.opendev.org/q/topic:%22retire-tripleo%22 Change-Id: Id6fc86b570627bc6863dde330877966da3126fe6 (cherry picked from commita2447137d9
) (cherry picked from commitbc0ee00338
)
This commit is contained in:
parent
99c7a96667
commit
a29ee03f00
|
@ -8,7 +8,7 @@ trove.egg*
|
|||
.eggs/
|
||||
trove/vcsversion.py
|
||||
*py*.egg
|
||||
.coverage.*
|
||||
.coverage
|
||||
coverage.xml
|
||||
cover/
|
||||
dist/
|
||||
|
|
|
@ -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_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
|
||||
TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove}
|
||||
TROVE_CONF=${TROVE_CONF:-${TROVE_CONF_DIR}/trove.conf}
|
||||
|
@ -87,7 +83,23 @@ TROVE_ENABLE_IMAGE_BUILD=${TROVE_ENABLE_IMAGE_BUILD:-"true"}
|
|||
TROVE_NON_DEV_IMAGE_URL=${TROVE_NON_DEV_IMAGE_URL:-""}
|
||||
|
||||
# Customized database container images
|
||||
<<<<<<< HEAD (99c7a9 stable-only: Pin bandit)
|
||||
TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"catalystcloud/mysql"}
|
||||
TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"catalystcloud/postgres"}
|
||||
TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-"catalystcloud/db-backup-mysql:1.1.0"}
|
||||
TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"catalystcloud/db-backup-postgresql:1.1.2"}
|
||||
=======
|
||||
if [ "$TROVE_ENABLE_LOCAL_REGISTRY" == "True" ] ; then
|
||||
TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/mysql"}
|
||||
TROVE_DATABASE_IMAGE_MARIADB=${TROVE_DATABASE_IMAGE_MARIAD:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/mariadb"}
|
||||
TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/postgres"}
|
||||
TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/db-backup-mysql:1.1.0"}
|
||||
TROVE_DATABASE_BACKUP_IMAGE_MARIADB=${TROVE_DATABASE_BACKUP_IMAGE_MARIADB:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/db-backup-mariadb:1.1.0"}
|
||||
TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/db-backup-postgresql:1.1.2"}
|
||||
else
|
||||
TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"catalystcloud/mysql"}
|
||||
TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"catalystcloud/postgres"}
|
||||
TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-"catalystcloud/db-backup-mysql:1.1.0"}
|
||||
TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"catalystcloud/db-backup-postgresql:1.1.2"}
|
||||
fi
|
||||
>>>>>>> CHANGE (2b6ea5 Retire TripleO: remove the TripleO jobs/ref)
|
||||
|
|
|
@ -305,7 +305,7 @@ function git_checkout() {
|
|||
|
||||
if [ -n "$REPO_BRANCH" ]; then
|
||||
pushd "$REPO_DIR"
|
||||
if [ $PROJECT == "diskimage-builder" ] || [ $PROJECT == "tripleo-image-elements" ]; then
|
||||
if [ $PROJECT == "diskimage-builder" ]; then
|
||||
REPO_BRANCH=master
|
||||
fi
|
||||
CURRENT_BRANCH=$(git branch | grep "\*" | awk '{print $2}')
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
diskimage-builder
|
||||
tripleo-image-elements
|
||||
|
|
|
@ -262,7 +262,6 @@ function install_prep_packages() {
|
|||
#pkg_install git-core kvm-ipxe gettext
|
||||
pkg_install git-core gettext
|
||||
fi
|
||||
sudo -H $HTTP_PROXY pip install --upgrade pip dib-utils
|
||||
}
|
||||
|
||||
function install_devstack_code() {
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
required-projects:
|
||||
- openstack/tempest
|
||||
- openstack/diskimage-builder
|
||||
- openstack/tripleo-image-elements
|
||||
- openstack/trove
|
||||
- openstack/trove-dashboard
|
||||
vars:
|
||||
|
@ -408,7 +407,6 @@
|
|||
required-projects:
|
||||
- openstack/diskimage-builder
|
||||
- openstack/trove
|
||||
- openstack/tripleo-image-elements
|
||||
|
||||
- job:
|
||||
name: trove-ubuntu-guest-image-build
|
||||
|
@ -419,7 +417,6 @@
|
|||
required-projects:
|
||||
- openstack/diskimage-builder
|
||||
- openstack/trove
|
||||
- openstack/tripleo-image-elements
|
||||
files:
|
||||
- ^integration/(scripts|tests)/
|
||||
vars:
|
||||
|
@ -439,7 +436,6 @@
|
|||
required-projects:
|
||||
- openstack/diskimage-builder
|
||||
- openstack/trove
|
||||
- openstack/tripleo-image-elements
|
||||
files:
|
||||
- ^integration/(scripts|tests)/
|
||||
vars:
|
||||
|
|
|
@ -41,7 +41,14 @@
|
|||
periodic:
|
||||
jobs:
|
||||
- publish-trove-guest-image-ubuntu-focal:
|
||||
branches: ^(?!stable/.*).*$
|
||||
branches:
|
||||
regex: ^stable/.*$
|
||||
negate: true
|
||||
- publish-trove-guest-image-ubuntu-focal-dev:
|
||||
branches: ^(?!stable/.*).*$
|
||||
|
||||
branches:
|
||||
regex: ^stable/.*$
|
||||
negate: true
|
||||
- publish-trove-datastore-images:
|
||||
branches:
|
||||
regex: ^stable/.*$
|
||||
negate: true
|
||||
|
|
Loading…
Reference in New Issue