From d76088cfb8c3e235798e77113f9851117eddcfc1 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Wed, 11 Feb 2015 12:54:41 +0300 Subject: [PATCH] Use Ubuntu Trusty for Jenkins slaves Change-Id: If939be4b8e44e92945cd4d544099b520d8cbacbc --- config/devstack/local.sh | 1 + config/devstack/localrc | 2 +- config/nodepool/sahara.yaml | 16 ++++++++-------- config/nodepool/scripts/prepare_node.sh | 4 ++-- jenkins_job_builder/diskimage.yaml | 8 ++++---- jenkins_job_builder/sahara.yaml | 14 +++++++------- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/config/devstack/local.sh b/config/devstack/local.sh index fc53268b..d2f5f4dd 100644 --- a/config/devstack/local.sh +++ b/config/devstack/local.sh @@ -77,6 +77,7 @@ glance image-create --name ubuntu_cdh_latest --file $UBUNTU_CDH_IMAGE_PATH --dis glance image-create --name sahara_spark_latest --file $SPARK_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.0.0'='True' --property '_sahara_username'="ubuntu" glance image-create --name ubuntu-test-image --file $NATIVE_UBUNTU_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true glance image-update --name ubuntu-12.04 --property '_sahara_tag_ci'='True' ubuntu-12.04-server-cloudimg-amd64-disk1 +glance image-update --name ubuntu-14.04 trusty-server-cloudimg-amd64-disk1 # switch to ci-user credentials source $ADMIN_RCFILE ci-user ci diff --git a/config/devstack/localrc b/config/devstack/localrc index b0bde57f..1b0a8899 100644 --- a/config/devstack/localrc +++ b/config/devstack/localrc @@ -72,4 +72,4 @@ CINDER_SECURE_DELETE=False RECLONE=yes API_RATE_LIMIT=False -IMAGE_URLS=http://cloud-images.ubuntu.com/releases/precise/release/ubuntu-12.04-server-cloudimg-amd64-disk1.img +IMAGE_URLS=http://cloud-images.ubuntu.com/releases/precise/release/ubuntu-12.04-server-cloudimg-amd64-disk1.img,https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img diff --git a/config/nodepool/sahara.yaml b/config/nodepool/sahara.yaml index 76f46339..4e883bd0 100644 --- a/config/nodepool/sahara.yaml +++ b/config/nodepool/sahara.yaml @@ -11,13 +11,13 @@ gearman-servers: - host: 127.0.0.1 labels: - - name: precise-neutron - image: precise-neutron + - name: trusty-neutron + image: trusty-neutron min-ready: 3 providers: - name: cilab-1 - - name: precise-nova - image: precise-nova + - name: trusty-nova + image: trusty-nova min-ready: 3 providers: - name: cilab-2 @@ -39,8 +39,8 @@ providers: networks: - net-id: 'CI_LAB_PRIVATE_NETWORK_ID' images: - - name: precise-neutron - base-image: 'ubuntu-12.04' + - name: trusty-neutron + base-image: 'ubuntu-14.04' min-ram: 2048 private-key: '/etc/nodepool/id_dsa' setup: prepare_node_bare.sh @@ -60,8 +60,8 @@ providers: networks: - net-id: 'STACK_SAHARA_PRIVATE_NETWORK_ID' images: - - name: precise-nova - base-image: 'ubuntu-12.04' + - name: trusty-nova + base-image: 'ubuntu-14.04' min-ram: 2048 private-key: '/etc/nodepool/id_dsa' setup: prepare_node_bare.sh diff --git a/config/nodepool/scripts/prepare_node.sh b/config/nodepool/scripts/prepare_node.sh index e17712d7..4b37f352 100755 --- a/config/nodepool/scripts/prepare_node.sh +++ b/config/nodepool/scripts/prepare_node.sh @@ -29,7 +29,7 @@ sudo git clone https://review.openstack.org/p/openstack-infra/system-config.git sudo /bin/bash /root/config/install_modules.sh #if [ -z "$NODEPOOL_SSH_KEY" ] ; then sudo puppet apply --modulepath=/root/config/modules:/etc/puppet/modules \ - -e "class {'openstack_project::single_use_slave': sudo => $SUDO, thin => $THIN, }" + -e "class {'openstack_project::single_use_slave': sudo => $SUDO, thin => $THIN, enable_unbound => false, }" #else # sudo puppet apply --modulepath=/root/config/modules:/etc/puppet/modules \ # -e "class {'openstack_project::single_use_slave': install_users => false, sudo => $SUDO, thin => $THIN, ssh_key => '$NODEPOOL_SSH_KEY', }" @@ -58,7 +58,7 @@ sudo pip install python-glanceclient sudo apt-get install qemu kpartx -y #install Sahara requirements -sudo pip install mysql-python +sudo pip install mysql-python psycopg2 cd /tmp && git clone https://git.openstack.org/openstack/sahara cd sahara && sudo pip install -U -r requirements.txt diff --git a/jenkins_job_builder/diskimage.yaml b/jenkins_job_builder/diskimage.yaml index 596dd5b4..20c763f4 100644 --- a/jenkins_job_builder/diskimage.yaml +++ b/jenkins_job_builder/diskimage.yaml @@ -19,7 +19,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME" - node: 'precise-nova' + node: 'trusty-nova' - job-template: name: 'dib-{network}-direct-{plugin}-{os}-aio' @@ -42,7 +42,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME" - node: 'precise-{network}' + node: 'trusty-{network}' - job-template: name: 'dib-nova-direct-{plugin}-aio' @@ -65,7 +65,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME" - node: 'precise-nova' + node: 'trusty-nova' - job-template: name: 'dib-neutron-heat-{plugin}-{os}' @@ -88,7 +88,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME" - node: 'precise-neutron' + node: 'trusty-neutron' - project: name: sahara-image-elements diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml index 6e656425..dfeabaff 100644 --- a/jenkins_job_builder/sahara.yaml +++ b/jenkins_job_builder/sahara.yaml @@ -25,7 +25,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME" - node: precise-neutron || precise-nova + node: trusty-neutron || trusty-nova - job: name: 'tempest-sahara-tests' @@ -54,7 +54,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME" - node: precise-neutron || precise-nova + node: trusty-neutron || trusty-nova - job-template: name: 'gate-saharaclient-neutron-{plugin-neutron}' @@ -80,7 +80,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME" - node: 'precise-neutron' + node: 'trusty-neutron' - job-template: name: 'gate-saharaclient-nova-{plugin-nova_network}' @@ -106,7 +106,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME\ \nHOST_NAME=$NODE_NAME" - node: 'precise-nova' + node: 'trusty-nova' - job-template: name: 'gate-sahara-neutron-{plugin-neutron}' @@ -132,7 +132,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME \nHOST_NAME=$NODE_NAME" - node: 'precise-neutron' + node: 'trusty-neutron' - job-template: name: 'gate-sahara-nova-{plugin-nova_network}' @@ -158,7 +158,7 @@ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ \nPREV_JOB=$JOB_NAME \nHOST_NAME=$NODE_NAME" - node: 'precise-nova' + node: 'trusty-nova' - project: name: sahara @@ -220,7 +220,7 @@ \n

This job runs pep8 check using trunk version of hacking" disabled: false concurrent: true - node: precise-neutron || precise-nova + node: trusty-neutron || trusty-nova builders: - gerrit-git-prep