opendev/system-config
Code Issues Proposed changes

Merge "Save and report nodepool image names"

Browse Source
This commit is contained in:
Jenkins 2014-08-22 20:13:02 +00:00 committed by Gerrit Code Review
commit 32b5459657
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openstack_project/files/nodepool/scripts/prepare_node.sh
View File

@ -40,6 +40,9 @@ then
echo "127.0.1.1 $HOSTNAME" | sudo tee -a /etc/hosts echo "127.0.1.1 $HOSTNAME" | sudo tee -a /etc/hosts
fi fi
echo $HOSTNAME > /tmp/image-hostname.txt
sudo mv /tmp/image-hostname.txt /etc/image-hostname.txt
# Fedora image doesn't come with wget # Fedora image doesn't come with wget
if [ -f /usr/bin/yum ]; then if [ -f /usr/bin/yum ]; then
sudo yum -y install wget sudo yum -y install wget

2
modules/openstack_project/files/slave_scripts/run-tox.sh
View File

@ -21,6 +21,8 @@ then
exit 1 exit 1
fi fi
cat /etc/image-hostname.txt
/usr/local/jenkins/slave_scripts/jenkins-oom-grep.sh pre /usr/local/jenkins/slave_scripts/jenkins-oom-grep.sh pre
sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre

2
modules/openstack_project/files/slave_scripts/run-unittests.sh
View File

@ -20,6 +20,8 @@ export NOSE_HTML_OUT_FILE='nose_results.html'
export TMPDIR=`/bin/mktemp -d` export TMPDIR=`/bin/mktemp -d`
trap "rm -rf $TMPDIR" EXIT trap "rm -rf $TMPDIR" EXIT
cat /etc/image-hostname.txt
/usr/local/jenkins/slave_scripts/jenkins-oom-grep.sh pre /usr/local/jenkins/slave_scripts/jenkins-oom-grep.sh pre
sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre