openstack
/
tripleo-ci
Code Issues Proposed changes

Fix TripleO CI jobs 

Fix TripleO CI jobs to be compatible with Zuul v3

Change-Id: Ibf6e7290528d072443bf7fa0ad22938e861538c6
This commit is contained in:
Sagi Shnaidman 2017-09-30 07:55:54 +03:00
parent 17aba188bd
commit 49a6109cbd
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/common_functions.sh
View File

@ -310,7 +310,7 @@ function delorean_build_and_serve {
for PROJFULLREF in $ZUUL_CHANGES ; do
PROJ=$(filterref $PROJFULLREF)
# If ci is being run for a change to ci its ok not to have a ci produced repository
excluded_proj="tripleo-ci tripleo-quickstart tripleo-quickstart-extras puppet-openstack-integration grenade"
excluded_proj="tripleo-ci tripleo-quickstart tripleo-quickstart-extras puppet-openstack-integration grenade zuul-jobs"
if [[ " $excluded_proj " =~ " $PROJ " ]]; then
mkdir -p $TRIPLEO_ROOT/delorean/data/repos/current
touch $TRIPLEO_ROOT/delorean/data/repos/current/delorean-ci.repo
@ -420,7 +420,7 @@ function prepare_images_oooq {
}
function subnodes_scp_deploy_env {
for ip in $(cat /etc/nodepool/sub_nodes); do
for ip in $(cat /etc/nodepool/sub_nodes_private); do
sanitized_address=$(sanitize_ip_address $ip)
ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
sudo mkdir -p $TRIPLEO_ROOT/tripleo-ci

4
scripts/deploy.sh
View File

@ -468,8 +468,8 @@ if [ "$OVERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
# Re-enable the delorean-ci repo, as ZUUL_REFS,
# and thus the contents of delorean-ci may contain packages
# we want to test for the current branch on upgrade
if [ -s /etc/nodepool/sub_nodes ]; then
for ip in $(cat /etc/nodepool/sub_nodes); do
if [ -s /etc/nodepool/sub_nodes_private ]; then
for ip in $(cat /etc/nodepool/sub_nodes_private); do
ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
sudo sed -i -e \"s/enabled=0/enabled=1/\" /etc/yum.repos.d/delorean-ci.repo
done

10
toci_gate_test-oooq.sh
View File

@ -35,12 +35,12 @@ if [ -f /etc/nodepool/provider ] ; then
# host setup
export RHCLOUD=''
if [ $NODEPOOL_CLOUD == 'tripleo-test-cloud-rh1' ]; then
if [ ${NODEPOOL_CLOUD:-''} == 'tripleo-test-cloud-rh1' ]; then
RHCLOUD='rh1'
elif [ $NODEPOOL_PROVIDER == 'rdo-cloud-tripleo' ]; then
elif [ ${NODEPOOL_PROVIDER:-''} == 'rdo-cloud-tripleo' ]; then
RHCLOUD='rdocloud'
fi
if [ $RHCLOUD != '' ]; then
if [[ "$RHCLOUD" != '' ]]; then
source $(dirname $0)/scripts/$RHCLOUD.env
# In order to save space remove the cached git repositories, at this point in
@ -158,8 +158,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
fi
UNDERCLOUD="127.0.0.2"
TAGS="build,undercloud-setup,undercloud-scripts,undercloud-install,undercloud-post-install,tripleo-validations,overcloud-scripts,overcloud-prep-config,overcloud-prep-containers,overcloud-deploy,overcloud-upgrade,overcloud-validate"
CONTROLLER_HOSTS=$(sed -n 1,1p /etc/nodepool/sub_nodes)
OVERCLOUD_HOSTS=$(cat /etc/nodepool/sub_nodes)
CONTROLLER_HOSTS=$(sed -n 1,1p /etc/nodepool/sub_nodes_private)
OVERCLOUD_HOSTS=$(cat /etc/nodepool/sub_nodes_private)
;;
singlenode)
ENVIRONMENT="osinfra"

6
toci_gate_test-orig.sh
View File

@ -290,12 +290,12 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
NODECOUNT=2
PACEMAKER=1
OVERCLOUD_ROLES="ControllerApi Controller"
export ControllerApi_hosts=$(sed -n 1,1p /etc/nodepool/sub_nodes)
export Controller_hosts=$(sed -n 2,2p /etc/nodepool/sub_nodes)
export ControllerApi_hosts=$(sed -n 1,1p /etc/nodepool/sub_nodes_private)
export Controller_hosts=$(sed -n 2,2p /etc/nodepool/sub_nodes_private)
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/multinode-3nodes.yaml --compute-scale 0 --overcloud-ssh-user $OVERCLOUD_SSH_USER --validation-errors-nonfatal -r /usr/share/openstack-tripleo-heat-templates/ci/environments/multinode-3nodes.yaml"
else
NODECOUNT=1
CONTROLLER_HOSTS=$(sed -n 1,1p /etc/nodepool/sub_nodes)
CONTROLLER_HOSTS=$(sed -n 1,1p /etc/nodepool/sub_nodes_private)
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e $MULTINODE_ENV_PATH --compute-scale 0 --overcloud-ssh-user $OVERCLOUD_SSH_USER --validation-errors-nonfatal"
fi

10
toci_instack_osinfra.sh
View File

@ -79,8 +79,8 @@ source $TRIPLEO_ROOT/tripleo-ci/deploy.env
# TODO: remove later, this is for live debugging
sudo cat /etc/nodepool/*
if [ -s /etc/nodepool/sub_nodes ]; then
for ip in $(cat /etc/nodepool/sub_nodes); do
if [ -s /etc/nodepool/sub_nodes_private ]; then
for ip in $(cat /etc/nodepool/sub_nodes_private); do
sanitized_address=$(sanitize_ip_address $ip)
ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-[a-z]*
@ -123,8 +123,8 @@ if [ -s /etc/nodepool/sub_nodes ]; then
# Disable the delorean-ci repo for the initial overcloud deploy, as
# ZUUL_REFS, and thus the contents of delorean-ci can only reference
# patches for the current branch, not UPGRADE_RELEASE
if [ -s /etc/nodepool/sub_nodes ]; then
for ip in $(cat /etc/nodepool/sub_nodes); do
if [ -s /etc/nodepool/sub_nodes_private ]; then
for ip in $(cat /etc/nodepool/sub_nodes_private); do
ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
sudo sed -i -e \"s/enabled=1/enabled=0/\" /etc/yum.repos.d/delorean-ci.repo
done
@ -144,7 +144,7 @@ if [ -s /etc/nodepool/sub_nodes ]; then
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
EOF
for ip in $(cat /etc/nodepool/sub_nodes); do
for ip in $(cat /etc/nodepool/sub_nodes_private); do
sanitized_address=$(sanitize_ip_address $ip)
scp $SSH_OPTIONS -i /etc/nodepool/id_rsa $hosts ${sanitized_address}:hosts
ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \

2
toci_quickstart.sh
View File

@ -96,7 +96,7 @@ cp $LOGS_DIR/undercloud/home/$USER/tempest/tempest.html.gz ${LOGS_DIR} || true
# Copy tempest and .testrepository directory to /opt/stack/new/tempest and
# unzip
sudo mkdir -p /opt/stack/new
sudo cp -Rf $LOGS_DIR/undercloud/home/jenkins/tempest /opt/stack/new || true
sudo cp -Rf $LOGS_DIR/undercloud/home/$USER/tempest /opt/stack/new || true
sudo gzip -d -r /opt/stack/new/tempest/.testrepository || true
export ARA_DATABASE="sqlite:///$LOCAL_WORKING_DIR/ara.sqlite"