Add more instack jenkins jobs, and fix a few issues
This commit is contained in:
parent
2c16cd5a8c
commit
306edfa6b8
@ -23,7 +23,11 @@ cd /opt
|
|||||||
git clone https://github.com/enovance/jjb-openstack.git jenkins_jobs
|
git clone https://github.com/enovance/jjb-openstack.git jenkins_jobs
|
||||||
rm -fr /etc/jenkins_jobs
|
rm -fr /etc/jenkins_jobs
|
||||||
ln -s /opt/jenkins_jobs /etc/jenkins_jobs
|
ln -s /opt/jenkins_jobs /etc/jenkins_jobs
|
||||||
/opt/jenkins-job-builder/jenkins_jobs/cmd.py update --delete-old /etc/jenkins_jobs/jobs:/home/stack/instack-undercloud/jenkins-jobs
|
# Symlink our instack jenkins jobs under /etc/jenkins_jobs/jobs
|
||||||
|
# Otherwise the jenkins job that periodically updates all the jobs will blow
|
||||||
|
# away any other jobs we define.
|
||||||
|
ln -f -s /home/stack/instack-undercloud/jenkins-jobs/* /etc/jenkins_jobs/jobs
|
||||||
|
/opt/jenkins-job-builder/jenkins_jobs/cmd.py update --delete-old /etc/jenkins_jobs/jobs
|
||||||
|
|
||||||
# Open iptables port for puppetmaster
|
# Open iptables port for puppetmaster
|
||||||
add-rule INPUT -p tcp --dport 8140 -j ACCEPT
|
add-rule INPUT -p tcp --dport 8140 -j ACCEPT
|
||||||
|
@ -9,10 +9,11 @@
|
|||||||
- shell: >
|
- shell: >
|
||||||
sudo /bin/bash -c "
|
sudo /bin/bash -c "
|
||||||
source /root/stackrc;
|
source /root/stackrc;
|
||||||
DEPLOY_HEAT_TEMPLATE=/home/stack/instack-undercloud/heat-templates/ironic-deployment.yaml
|
DEPLOY_HEAT_TEMPLATE=/home/stack/instack-undercloud/heat-templates/ironic-deployment.yaml
|
||||||
|
NULL_STATS=1
|
||||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||||
--register-nodes
|
--register-nodes
|
||||||
--nodes-json /home/stack/nodes.json
|
--nodes-json /home/stack/instackenv.json
|
||||||
--discover-nodes
|
--discover-nodes
|
||||||
--show-profile
|
--show-profile
|
||||||
--deploy-nodes"
|
--deploy-nodes"
|
||||||
@ -27,9 +28,10 @@
|
|||||||
- shell: >
|
- shell: >
|
||||||
sudo /bin/bash -c "
|
sudo /bin/bash -c "
|
||||||
source /root/stackrc;
|
source /root/stackrc;
|
||||||
|
NULL_STATS=1
|
||||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||||
--register-nodes
|
--register-nodes
|
||||||
--nodes-json /opt/stack/nodes.json"
|
--nodes-json /home/stack/instackenv.json"
|
||||||
- job:
|
- job:
|
||||||
name: 'instack-ironic-deployment-discovery'
|
name: 'instack-ironic-deployment-discovery'
|
||||||
description: 'Use Ironic to do node discovery'
|
description: 'Use Ironic to do node discovery'
|
||||||
@ -54,6 +56,7 @@
|
|||||||
- shell: >
|
- shell: >
|
||||||
sudo /bin/bash -c "
|
sudo /bin/bash -c "
|
||||||
source /root/stackrc;
|
source /root/stackrc;
|
||||||
|
DEPLOY_HEAT_TEMPLATE=/home/stack/instack-undercloud/heat-templates/ironic-deployment.yaml
|
||||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||||
--deploy-nodes"
|
--deploy-nodes"
|
||||||
- job:
|
- job:
|
||||||
@ -82,3 +85,28 @@
|
|||||||
source /root/stackrc;
|
source /root/stackrc;
|
||||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||||
--setup-flavors"
|
--setup-flavors"
|
||||||
|
- job:
|
||||||
|
name: 'instack-ironic-deployment-delete-stack'
|
||||||
|
description: 'Use Ironic to setup flavors'
|
||||||
|
project-type: freestyle
|
||||||
|
wrappers:
|
||||||
|
- ansicolor:
|
||||||
|
colormap: xterm
|
||||||
|
builders:
|
||||||
|
- shell: >
|
||||||
|
sudo /bin/bash -c "
|
||||||
|
source /root/stackrc;
|
||||||
|
heat stack-delete ironic-discover"
|
||||||
|
- job:
|
||||||
|
name: 'instack-ironic-deployment-delete-nodes'
|
||||||
|
description: 'Use Ironic to setup flavors'
|
||||||
|
project-type: freestyle
|
||||||
|
wrappers:
|
||||||
|
- ansicolor:
|
||||||
|
colormap: xterm
|
||||||
|
builders:
|
||||||
|
- shell: >
|
||||||
|
sudo /bin/bash -c "
|
||||||
|
source /root/stackrc;
|
||||||
|
for n in $(ironic node-list | grep power | awk '{print $2}'); do ironic node-delete $n; done"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user