X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=nodepool%2Fnodepool.yaml;h=408cfc168b7b3d339fbb76b657b4b93cf6364235;hb=5f68bc23940647a8afe08fed3f49800edbf3d0be;hp=b603928bc1996218d2b089bf12256a1a65af84b6;hpb=827a73efebc1f9db7d128f0382f0b728d9bdbd39;p=ci-management.git diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index b603928bc..408cfc168 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -37,8 +37,8 @@ providers: public: True images: - name: 'trusty' - #base-image: 'Ubuntu 14.04 LTS - basebuild - 20160202' - base-image: '72ac4b06-74bb-40ee-97f9-835a797354a9' + #base-image: 'Ubuntu 14.04 - basebuild - 20160518T202806' + base-image: 'ce91c99d-3cda-4ffe-bcdb-8293ac65d95e' min-ram: 4096 setup: 'verify_merge.sh' username: 'jenkins' @@ -53,14 +53,22 @@ providers: networks: - name: 'fdio' public: True - - name: 'TestNet1' + - name: 'Interlink1' public: False - - name: 'TestNet2' + - name: 'Interlink2' + public: False + - name: 'Interlink3' + public: False + - name: 'Interlink4' + public: False + - name: 'Interlink5' + public: False + - name: 'Interlink6' public: False images: - name: 'trusty-multilink' - #base-image: 'Ubuntu 14.04 LTS - basebuild - 20160202' - base-image: '72ac4b06-74bb-40ee-97f9-835a797354a9' + #base-image: 'Ubuntu 14.04 - basebuild - 20160518T202806' + base-image: 'ce91c99d-3cda-4ffe-bcdb-8293ac65d95e' min-ram: 4096 setup: 'multilink.sh' username: 'jenkins' @@ -71,4 +79,4 @@ targets: #hostname: 'np-{label.name}-{provider.name}-{node_id}' #subnode-hostname: 'np-{label.name}-{provider.name}-{node_id}' hostname: 'np-{label.name}-{node_id}' - subnode-hostname: 'np-{label.name}-{node_id}' + subnode-hostname: 'np-sub-{label.name}-{node_id}'