Align stars to deploy OpenStack trunk on June 22th
Squash (required) between 2 commits:
1) Promote RDO repository to latest trunk, so we have latest
keystonemiddleware.
2) copy_logs.sh: fix permissions
- Do not fail if some logs are not created, sometimes Puppet catalog
fails for some reasons, and services are not up, so logs are not
created.
- Make sure zuul will be able to rsync all logs without
permission issue.
Change-Id: Ife6b27a3b776aaaa0be6aea43683c9e533866e02
This commit is contained in:
11
copy_logs.sh
11
copy_logs.sh
@@ -43,6 +43,10 @@ for project in /etc/puppet/modules/*; do
|
||||
fi
|
||||
done
|
||||
|
||||
# start of log capture
|
||||
# some commands could fail if service failed to be installed during Puppet runs
|
||||
set +e
|
||||
|
||||
# Archive the project config & logs
|
||||
mkdir $LOG_DIR/etc/
|
||||
for p in $PROJECTS; do
|
||||
@@ -166,9 +170,14 @@ free -m > $LOG_DIR/free.txt
|
||||
cat /proc/cpuinfo > $LOG_DIR/cpuinfo.txt
|
||||
ps -eo user,pid,ppid,lwp,%cpu,%mem,size,rss,cmd > $LOG_DIR/ps.txt
|
||||
|
||||
# Make sure jenkins can read all the logs and configs
|
||||
# end of log capture
|
||||
set -e
|
||||
|
||||
# Set permissions to let jenkins compress and archive logs.
|
||||
# Also make sure zuul can rsync all the logs and configs
|
||||
sudo find $LOG_DIR -type d -execdir sudo chmod 755 '{}' \;
|
||||
sudo find $LOG_DIR -type f -execdir sudo chmod 644 '{}' \;
|
||||
sudo chown -R jenkins:jenkins $LOG_DIR
|
||||
|
||||
# do not try to save symlinks because source files might not have
|
||||
# the right permissions to let jenkins user to upload them on log servers.
|
||||
|
||||
@@ -30,7 +30,7 @@ class openstack_integration::repos {
|
||||
manage_epel => false,
|
||||
repo_hash => {
|
||||
'newton-current' => {
|
||||
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/9e/28/9e2897e0e15115db73439d5c6e957333868a9d0e_a3ee549d/',
|
||||
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/5f/fd/5ffd83808f7acba7856b8b83ce665940e70e62d9_40656fbe/',
|
||||
'descr' => 'Newton current',
|
||||
'gpgcheck' => 'no',
|
||||
'priority' => 1,
|
||||
|
||||
Reference in New Issue
Block a user