From 9ff5011f657098dd13650bb93fb07ebafe0c3c88 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 10:05:41 +0000 Subject: [PATCH 01/20] Add a non-working encrypted acceptance.yml for testing --- .gitignore | 3 +++ .travis.yml | 3 +++ .travis/secrets/acceptance.yml.enc | Bin 0 -> 272 bytes 3 files changed, 6 insertions(+) create mode 100644 .travis/secrets/acceptance.yml.enc diff --git a/.gitignore b/.gitignore index 796dc06763..e7a4a0e433 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,6 @@ jobs.groovy # Vagrant dev items Vagrantfile .vagrant/ + +# Travis-CI encrypted files +.travis/secrets/ diff --git a/.travis.yml b/.travis.yml index f369a10652..ea8ff671a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,9 @@ cache: pip: true apt: true +before_install: + - openssl aes-256-cbc -K $encrypted_02804a7cf34b_key -iv $encrypted_02804a7cf34b_iv -in .travis/secrets/acceptance.yml.enc -out .travis/secrets/acceptance.yml -d + install: - pip install tox awscli diff --git a/.travis/secrets/acceptance.yml.enc b/.travis/secrets/acceptance.yml.enc new file mode 100644 index 0000000000000000000000000000000000000000..79349ab637e9de9b9fac723e24ee47a2bedd6192 GIT binary patch literal 272 zcmV+r0q_0}wm0ImEJ5;n%>3AL3yH*iiPO5+<8Ux?s%<_!!J_fIgAQQx1`mKB_LRs8eLkM#NA zjJV18k9O_kW^+Lhz}*01v6{iwPr-TgYMi#%3Ocm(a?Rp=5aSch1oP`%C;2b>+HJ2m zPch7hpfqK(JXL@IeaA`S1Vi0f(Z(OG3VFm#ZP-o&PGeHg}OZf(IBJFI+QFfXCkvt&&#JSqN4gW&M5j~jI W6F_cbP3DILZ`5soWY2G_*eD^c*NQ*@ literal 0 HcmV?d00001 From 4e529d3d037f3891e838704601db140a4567a7fb Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 10:09:13 +0000 Subject: [PATCH 02/20] A function for running acceptance tests and a way to parse build names and parameters. --- .travis.yml | 11 +++++++---- .travis/after_script | 2 +- .travis/script | 46 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea8ff671a8..07ad6f923b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,14 @@ install: - pip install tox awscli env: + - FLOCKER_BUILDER=acceptance:aws:centos-7:aws + - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws + - FLOCKER_BUILDER=acceptance-aws:ubuntu-1404:aws - FLOCKER_BUILDER=lint - - FLOCKER_BUILDER=docs-lint - - FLOCKER_BUILDER=docs-spelling - - FLOCKER_BUILDER=docs-linkcheck - - FLOCKER_BUILDER=docs-html + - FLOCKER_BUILDER=docs:lint + - FLOCKER_BUILDER=docs:spelling + - FLOCKER_BUILDER=docs:linkcheck + - FLOCKER_BUILDER=docs:html matrix: allow_failures: diff --git a/.travis/after_script b/.travis/after_script index 978bbb4931..5271f897b9 100755 --- a/.travis/after_script +++ b/.travis/after_script @@ -43,7 +43,7 @@ def publish_staging_docs(build_directory): HANDLERS = { - "docs-html": publish_staging_docs, + "docs:html": publish_staging_docs, } diff --git a/.travis/script b/.travis/script index b6aed85803..0127825212 100755 --- a/.travis/script +++ b/.travis/script @@ -11,6 +11,7 @@ Travis calls this during the `script` phase of its build lifecycle. Set ``FLOCKER_BUILDER`` environment variable before calling this script. """ +from functools import partial from os import environ from subprocess import call @@ -19,19 +20,48 @@ def tox(tox_env): return call(["tox", "-e", tox_env]) -BUILDERS = { +def docs(build_type): + return tox("docs-" + build_type) + + +def acceptance(provider, distribution, dataset_backend): + command = [ + "admin/run-acceptance-tests", + "--provider", provider, + "--distribution", distribution, + "--dataset-backend", dataset_backend, + "--config-file", ".travis/secrets/acceptance.yml" + ] + return call(command) + +HANDLERS = { + "acceptance": acceptance, "lint": tox, - "docs-lint": tox, - "docs-spelling": tox, - "docs-linkcheck": tox, - "docs-html": tox, + "docs": docs, } +def get_handler(build_label): + arguments = [] + parts = build_label.split(":") + while parts: + key = ":".join(parts) + handler = HANDLERS.get(key) + if handler: + break + arguments.append( + parts.pop() + ) + else: + raise KeyError("Handler not found", build_label, HANDLERS) + + return partial(handler, *arguments) + + def main(): - builder_name = environ["FLOCKER_BUILDER"] - builder = BUILDERS[builder_name] - return builder(builder_name) + build_label = environ["FLOCKER_BUILDER"] + handler = get_handler(build_label) + handler() if __name__ == "__main__": raise SystemExit(main()) From b4dc3df055f9dfb5818e545bfd16ff1a66781870 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 10:16:43 +0000 Subject: [PATCH 03/20] Disable the jenkins builds temporarily --- build.yaml => build.yaml.disabled | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build.yaml => build.yaml.disabled (100%) diff --git a/build.yaml b/build.yaml.disabled similarity index 100% rename from build.yaml rename to build.yaml.disabled From 47ecf6fb95e29a1033644e462b4102d027e659d1 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 10:20:04 +0000 Subject: [PATCH 04/20] Typos --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07ad6f923b..31f21a5d3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ install: env: - FLOCKER_BUILDER=acceptance:aws:centos-7:aws - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws - - FLOCKER_BUILDER=acceptance-aws:ubuntu-1404:aws + - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws - FLOCKER_BUILDER=lint - FLOCKER_BUILDER=docs:lint - FLOCKER_BUILDER=docs:spelling @@ -31,8 +31,8 @@ env: matrix: allow_failures: - - env: FLOCKER_BUILDER=docs-lint - - env: FLOCKER_BUILDER=docs-linkcheck + - env: FLOCKER_BUILDER=docs:lint + - env: FLOCKER_BUILDER=docs:linkcheck script: - .travis/script From bce0c790e64f482c31bdca7c13e9f3bd5dc42ede Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 10:21:18 +0000 Subject: [PATCH 05/20] Disable all but one of the travis builds for now --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31f21a5d3b..cd967f169b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,18 +21,18 @@ install: env: - FLOCKER_BUILDER=acceptance:aws:centos-7:aws - - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws - - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws - - FLOCKER_BUILDER=lint - - FLOCKER_BUILDER=docs:lint - - FLOCKER_BUILDER=docs:spelling - - FLOCKER_BUILDER=docs:linkcheck - - FLOCKER_BUILDER=docs:html - -matrix: - allow_failures: - - env: FLOCKER_BUILDER=docs:lint - - env: FLOCKER_BUILDER=docs:linkcheck +# - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws +# - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws +# - FLOCKER_BUILDER=lint +# - FLOCKER_BUILDER=docs:lint +# - FLOCKER_BUILDER=docs:spelling +# - FLOCKER_BUILDER=docs:linkcheck +# - FLOCKER_BUILDER=docs:html + +# matrix: +# allow_failures: +# - env: FLOCKER_BUILDER=docs:lint +# - env: FLOCKER_BUILDER=docs:linkcheck script: - .travis/script From fbc5102f013569cca4b1872eb4b78dbb32987a2e Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 10:22:56 +0000 Subject: [PATCH 06/20] Install the packages needed by run-acceptance-tests --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index cd967f169b..edeec1e4a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ before_install: - openssl aes-256-cbc -K $encrypted_02804a7cf34b_key -iv $encrypted_02804a7cf34b_iv -in .travis/secrets/acceptance.yml.enc -out .travis/secrets/acceptance.yml -d install: + - pip install --requirement requirements/flocker.txt + - pip install --requirement requirements/admin.txt - pip install tox awscli env: From e5454150b317cdf6d6efde7a428cbc0dcdcd4ed7 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 10:36:23 +0000 Subject: [PATCH 07/20] Return the returncode to fail the travis build --- .travis/script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/script b/.travis/script index 0127825212..36bf918b2c 100755 --- a/.travis/script +++ b/.travis/script @@ -61,7 +61,7 @@ def get_handler(build_label): def main(): build_label = environ["FLOCKER_BUILDER"] handler = get_handler(build_label) - handler() + return handler() if __name__ == "__main__": raise SystemExit(main()) From f5ecdff32b86fa85b7376d4d7fcef11fcdd1174e Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 10:46:20 +0000 Subject: [PATCH 08/20] Add AWS credentials to acceptance.yml --- .travis.yml | 1 + .travis/secrets/acceptance.yml.enc | Bin 272 -> 448 bytes 2 files changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index edeec1e4a0..9100f79d73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ cache: apt: true before_install: + # See ClusterHQ/segredos/ci-platform/all/acceptance.yaml - openssl aes-256-cbc -K $encrypted_02804a7cf34b_key -iv $encrypted_02804a7cf34b_iv -in .travis/secrets/acceptance.yml.enc -out .travis/secrets/acceptance.yml -d install: diff --git a/.travis/secrets/acceptance.yml.enc b/.travis/secrets/acceptance.yml.enc index 79349ab637e9de9b9fac723e24ee47a2bedd6192..f1c19c04d5e2123d9d67aa175c74ba4a3de444fc 100644 GIT binary patch literal 448 zcmV;x0YCnZEOLw7S_HZ)u6K0-kA*il>DBqI)h+zJWyr-Fzd9`+q+5G*=vqFeWK%*u zb@mvQ5I0#k#ZZ#IL1D%(7V8tu$UsVw&EdqIHq|1P9_EF(Opl#1R9^@fCy06+kx_I`|f!IoKK*3 zV%IemU)f+O`;}1?mZSvuin(KB%EDYyRY5lTYHc$Wx}jU0ks@fOc8*=AmHF{+b5fI- z;9JhhMrgc~CwEilmb3{`ZpDvJPrFPlPA=<_<4Hriy=ohEGT!kUYV1$68q;tpg^|?} z=wj`IYYPQ`*@8cP}|pI?eQbSil&YgbtI1?jCR=*XK+ zm125=Xz#VK{{aJI_obtvejtMN>bFz@Exsm!RFnsLzvE5n&1cu8MN$`4=Og)bO$*Fm z%K7B{qa74Bk1y3kk&^qI!Sl}>P??cp1w@v88vC+?W)ZKjc49d)xSrWiviW)J1C?<{ qO<~?mq+nj>wA6EEwI&GMC0&VMZTh5EnpQ}sXJQHGX<%p)f?{YtxZ79& literal 272 zcmV+r0q_0}wm0ImEJ5;n%>3AL3yH*iiPO5+<8Ux?s%<_!!J_fIgAQQx1`mKB_LRs8eLkM#NA zjJV18k9O_kW^+Lhz}*01v6{iwPr-TgYMi#%3Ocm(a?Rp=5aSch1oP`%C;2b>+HJ2m zPch7hpfqK(JXL@IeaA`S1Vi0f(Z(OG3VFm#ZP-o&PGeHg}OZf(IBJFI+QFfXCkvt&&#JSqN4gW&M5j~jI W6F_cbP3DILZ`5soWY2G_*eD^c*NQ*@ From 6a0d92952de052d72a7c5822ca4379d42eb89015 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 11:22:56 +0000 Subject: [PATCH 09/20] Disable boto DEBUG logging for now. --- flocker/provision/_aws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flocker/provision/_aws.py b/flocker/provision/_aws.py index 7e5800e24f..2532bc5651 100644 --- a/flocker/provision/_aws.py +++ b/flocker/provision/_aws.py @@ -80,7 +80,7 @@ def _enable_boto_logging(): logger.setLevel(logging.DEBUG) logger.addHandler(EliotLogHandler()) -_enable_boto_logging() +# _enable_boto_logging() class FailedToRun(Exception): From 514d70302c2c89f264d3753a01cf4de826d2f0e5 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 11:23:51 +0000 Subject: [PATCH 10/20] Add an encryted SSH key for logging into and provisioning acceptance test nodes --- .travis.yml | 10 +++++++++- .travis/secrets/id_rsa_vagrant_buildbot.enc | Bin 0 -> 1680 bytes 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .travis/secrets/id_rsa_vagrant_buildbot.enc diff --git a/.travis.yml b/.travis.yml index 9100f79d73..7ced4873a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,15 @@ cache: before_install: # See ClusterHQ/segredos/ci-platform/all/acceptance.yaml - - openssl aes-256-cbc -K $encrypted_02804a7cf34b_key -iv $encrypted_02804a7cf34b_iv -in .travis/secrets/acceptance.yml.enc -out .travis/secrets/acceptance.yml -d + - openssl aes-256-cbc -K $encrypted_02804a7cf34b_key -iv $encrypted_02804a7cf34b_iv + -in .travis/secrets/acceptance.yml.enc -out .travis/secrets/acceptance.yml -d + # The private SSH key used by `run-acceptance-tests` to log into and provision + # acceptance test nodes. + - openssl aes-256-cbc -K $encrypted_02804a7cf34b_key -iv $encrypted_02804a7cf34b_iv + -in .travis/secrets/id_rsa_vagrant_buildbot.enc -out .travis/secrets/id_rsa_vagrant_buildbot -d + - eval "$(ssh-agent -s)" + - chmod 600 .travis/secrets/id_rsa_vagrant_buildbot + - ssh-add .travis/secrets/id_rsa_vagrant_buildbot install: - pip install --requirement requirements/flocker.txt diff --git a/.travis/secrets/id_rsa_vagrant_buildbot.enc b/.travis/secrets/id_rsa_vagrant_buildbot.enc new file mode 100644 index 0000000000000000000000000000000000000000..8ea628b604d967d21d03e77bc7839e87c1f58373 GIT binary patch literal 1680 zcmV;B25FE!m_0(|x|(cdPHu1Jp&>~*$ndN*q}c(6f;G|L}j89VD55A!6R7?cD3 zD~R|debA>5EWJ0PkILyfQh`@orFUcb@x6>}SG5Sjkyj?Cdbj-}FvtwfD*~-o9W`*F zh5zhJ4S$euF12(mdkE@~Ogk<)u%iDTBbv6yL&MNo8?Fj68YdIcO{$*_O~Ap&DW{W@ zpslI9^03E(9N|9_`ACAm5~zFMf<(sixWU>#U)K*KFqs^XWGN{uPFct{(@=ORz9L#= zB+RM92jknC(5n&BjdvA%eCzEQuJ$H{Gb`C3(fg#ijaK zkOC2AR7aMw_E~G^`Wx}rll>hj3knSf)}ix?2w`2>2j}hu(?qDcCS`Y|?U|vqeE**& zZ0loQ-46e3cc4)p;&6?qj+bFo06N0u#95ZO-0_qVv{&Su zeKR|pqyOI+zlQ;AI9HQ?;aas?4}5%=!Qmf5`9wzWHTpf@ZeO{BiKOC$UUum(vpMvb z2M`P%|2#NPzJ1!v)%2))rdp-vQ5BBMDj3hsl)q%3JE3=~!Z&GZ@J#`OXcjWL8mA*` zQA?NR+HfT27({_5r^V#ze^4H3zO-gh>JNy{TuC&xKCm()Ys}4#sxtBxpxaiH5pyr= zm#WQz?|I}f*+qFd!OK#fiwL>QVHcb}0;}sOd*Tw=|4%b%->FTeZI;%_AgfQ>k!N^- znI4nrkUbH7FCjOW%JxV}q!Ft+pT|W_HrV$!N~7XSu#xxwak5z%!2M5gHqVA!;@JT@ znCP8|gcM*PeP3av4+I5`{lB@~JFY%f`V6?LSJvHf{BoDP-MmrcThHSy!q^DhlflrY z|4jndBOnph0}Jv@l9{VR2UYH;!&tbK5v7|*QG&tTBGokyrh_xQ>bfpcPBAOAk@;-9 zkN&A+UJ%7%p+0o@fV9{iWQ!uQP`vmTEd*B#%O;Mnk?$CL zz*1(I8SKxpa~2ve2QyYLwd(y^iJg|Y^1>=Blp$G?ez*DQc+}whcD#7+M9#Q;Ur|9` zw7ID^i$)@+m*4k(F93i}&&-qGnv=G@Kd#E+5+rW_&v;D*J2LUv{dcX>lXtXQ`tA#V zfs`(pn8u`PSJWDayMew}EnL8Ll~|v^4bfkxqQ7ub*c)J$ShfpR)Kh}Q=|$OuuGNZ= zky150= z|33svYSggC;lq*Ru8J19a}W)OrsFjogP`1r1^cz(&F==1c3vyuLT>lsb15yDKlV;x zQ??}mrW9uupu=84Lq`A}s@qP=J$~^Sx?5Vd&~TN~V+lsw3|v;+OE>PBk<;if+0QGk zf@~*j%t%{w**IJ+_~pzeGLV-_p5E-GRn2IH*+HaCW5YU=ObqnL&t%fqsn4JpxfH$n zv4gq&)wHl*dPz>W>C0gxy=kVBZIHYe-lDdbvZme>C?Pj(qu5_foo>F>v7aZ#Loo^* z^TxuJ=5X=sM!L5Vg+Cc~_#Im>YbEXc^O#D9hL;PVM)?IfFMl>>?V$AN#bH6$)%lnV zOt`YL>+s%NR5zDf%g%BWMo`t%X`Z9(ZrDWk?J~_*8Oynjg>SVsRINF}vROTbMgZF` zsw;E3tt46zx1G+(gQ4i^`@Y2mZOtF!`3c|dV;20nvf6w2C>G~=@Nx$K<07P??WCp8 zfx@=}inmyjHA+1N`UD`1G+x|KuMDLK;CCnsK#b!_G(}19Ri)ruECS?wNJLB4MAmRA ze7t2q8#8&Nr)uqetP21(qEFA}9T12iInNeL)}81qBQMRO5vjf&#q}UFt@a+=pYSEV zskHesG4WknAEh8CjB&mJd@0XsxfesZyC^D_#CIzW!soA!GD2YxVm2PNjVW*#emA|Z a)|YgI+~iM%xl Date: Wed, 30 Nov 2016 11:33:20 +0000 Subject: [PATCH 11/20] Put all the secrets in a single archive. --- .gitignore | 2 +- .travis.yml | 9 ++++----- .travis/secrets.tgz.enc | Bin 0 -> 1776 bytes .travis/secrets/acceptance.yml.enc | Bin 448 -> 0 bytes .travis/secrets/id_rsa_vagrant_buildbot.enc | Bin 1680 -> 0 bytes 5 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 .travis/secrets.tgz.enc delete mode 100644 .travis/secrets/acceptance.yml.enc delete mode 100644 .travis/secrets/id_rsa_vagrant_buildbot.enc diff --git a/.gitignore b/.gitignore index e7a4a0e433..2e0abdaa40 100644 --- a/.gitignore +++ b/.gitignore @@ -79,4 +79,4 @@ Vagrantfile .vagrant/ # Travis-CI encrypted files -.travis/secrets/ +.travis/secrets* diff --git a/.travis.yml b/.travis.yml index 7ced4873a4..09cf0ca527 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,11 @@ cache: before_install: # See ClusterHQ/segredos/ci-platform/all/acceptance.yaml + # Includes the private SSH key used by `run-acceptance-tests` to log into and + # provision acceptance test nodes. - openssl aes-256-cbc -K $encrypted_02804a7cf34b_key -iv $encrypted_02804a7cf34b_iv - -in .travis/secrets/acceptance.yml.enc -out .travis/secrets/acceptance.yml -d - # The private SSH key used by `run-acceptance-tests` to log into and provision - # acceptance test nodes. - - openssl aes-256-cbc -K $encrypted_02804a7cf34b_key -iv $encrypted_02804a7cf34b_iv - -in .travis/secrets/id_rsa_vagrant_buildbot.enc -out .travis/secrets/id_rsa_vagrant_buildbot -d + -in .travis/secrets.tgz.enc -out .travis/secrets.tgz -d + - tar --verbose --extract --file .travis/secrets.tgz - eval "$(ssh-agent -s)" - chmod 600 .travis/secrets/id_rsa_vagrant_buildbot - ssh-add .travis/secrets/id_rsa_vagrant_buildbot diff --git a/.travis/secrets.tgz.enc b/.travis/secrets.tgz.enc new file mode 100644 index 0000000000000000000000000000000000000000..d04c789f6d260998d24d88d8d63bb16ce6c5196d GIT binary patch literal 1776 zcmV=S#~CJgjx6tc zdtKrk%39>N=}nr#vq3pDc&0F{q^ZNekc?N+Qc^q55nwnW}Op_e1S32K5@eEg^QHpDVX^3TrX18PI47w_?oa<1B)sF3 z6KQkOs#lF;ZIJi<&5Is3c3g@H*@Do!llx;6;JRi~PnOe3a_S@j&D*ci70F2hp;VYv zWV&d#wLV)C3j+VGcXY!~D*83dc}?OfwbRvOt14?}Ao}W71_Qwh+XO#?Wq3|d23fsn zWcm0uxpc$_VQnlZEj3`!!K&mol@9|cH>ijns6Q!#`oUa;e@*Erc&x$}_kTXek;HP; zcDXq z+9^aK`HVmDoDd8}Vg>NFXK6UsLM??V(vRsDZXBh{%3fZ0J+YbxERju}3q^2$L;}kM z>|hUeZLz5%E_Kz!oDmvT2`dU63H(CgLXVtB+=w!H=MRd8K;k0s$mSMm9n__FdqC(v z`T19|I~}JbsT142_YocJT}UlFKcq&)#vibMqsUad06>zo3I$W*487SX6uPMNzYAg@ zo7l~Pob@LC_uZgyY29zx3IPO`H(&)Xhg9(F|!Smh|phE@y{0Sj`P2^5BY;^sQCdkc; z{RnGVORAaw{Rf78VV4V8Nm$I6e(u&&B`d(L1GaIn5+Gxy>WQSVd#D;nXEjc_9oy~q z{dkTN(7|v@aH{^(3^P0!B1ju_iO)|5QL&^^nu(y>gf;zyfm@{FG|QfU`z^(548IVk z6ZL!xu8QjB?O~|QxG*cq>Ad*&fio$I=)}jx492LL%qRogTYRfBU>von;A4pr2+{0j zZAIsIOPdRnMp%QV6ZdXt-y5JhHno}YdoA7vh5R1`_!_VY?Te7LZT}9<#B%0PJn37s zhO-8^<23oHq#wwzxm$6&z~CO4KSB{;q7XO8FW~^Ad^~^gCc`1K$z$=pd86~0?cC!1fM9acaFd6!iy429tArxv0Z)LdSVmvvmAE9?2HB z7@@;Z=vRTALF;=j{!OK}M-4h9t!4WPkCF2fgZy$|P#ASE37E`OzZilG?|$m|sfb&$ zxzx})48}3QK-6kDa{`p}KdN2%P~4>Q6c#!5g@+-5LG{}Fp*Ez^2y}?1{}IeRt}xX#vzV z$k=c(6fHpa&QLt1U}zEzGmGB|?^K55np1eGHA+rmapE%nc%n>xj&afLpwP@p8cJb8 zW{ESY^CgYXSEf&tGCxNOVkv06+zEHFU#*GJLkXPJoNwKGy6M-x=2! z4P#>T#&c*W_O*IHytn^?!uXfh$(!8$HK(nJQh#)5kzcS2Y7mFitC`>9Lk}g zyx0$|SZ8ejI2B!m?v4OWT#8x0mQO>Xu&-bYF~-y@ATPiP4Xkft!v*~P47}lW)I-5f zp{sv%lAs9dH5Re~QbU{T3^~RCzJr*giDBqI)h+zJWyr-Fzd9`+q+5G*=vqFeWK%*u zb@mvQ5I0#k#ZZ#IL1D%(7V8tu$UsVw&EdqIHq|1P9_EF(Opl#1R9^@fCy06+kx_I`|f!IoKK*3 zV%IemU)f+O`;}1?mZSvuin(KB%EDYyRY5lTYHc$Wx}jU0ks@fOc8*=AmHF{+b5fI- z;9JhhMrgc~CwEilmb3{`ZpDvJPrFPlPA=<_<4Hriy=ohEGT!kUYV1$68q;tpg^|?} z=wj`IYYPQ`*@8cP}|pI?eQbSil&YgbtI1?jCR=*XK+ zm125=Xz#VK{{aJI_obtvejtMN>bFz@Exsm!RFnsLzvE5n&1cu8MN$`4=Og)bO$*Fm z%K7B{qa74Bk1y3kk&^qI!Sl}>P??cp1w@v88vC+?W)ZKjc49d)xSrWiviW)J1C?<{ qO<~?mq+nj>wA6EEwI&GMC0&VMZTh5EnpQ}sXJQHGX<%p)f?{YtxZ79& diff --git a/.travis/secrets/id_rsa_vagrant_buildbot.enc b/.travis/secrets/id_rsa_vagrant_buildbot.enc deleted file mode 100644 index 8ea628b604d967d21d03e77bc7839e87c1f58373..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1680 zcmV;B25FE!m_0(|x|(cdPHu1Jp&>~*$ndN*q}c(6f;G|L}j89VD55A!6R7?cD3 zD~R|debA>5EWJ0PkILyfQh`@orFUcb@x6>}SG5Sjkyj?Cdbj-}FvtwfD*~-o9W`*F zh5zhJ4S$euF12(mdkE@~Ogk<)u%iDTBbv6yL&MNo8?Fj68YdIcO{$*_O~Ap&DW{W@ zpslI9^03E(9N|9_`ACAm5~zFMf<(sixWU>#U)K*KFqs^XWGN{uPFct{(@=ORz9L#= zB+RM92jknC(5n&BjdvA%eCzEQuJ$H{Gb`C3(fg#ijaK zkOC2AR7aMw_E~G^`Wx}rll>hj3knSf)}ix?2w`2>2j}hu(?qDcCS`Y|?U|vqeE**& zZ0loQ-46e3cc4)p;&6?qj+bFo06N0u#95ZO-0_qVv{&Su zeKR|pqyOI+zlQ;AI9HQ?;aas?4}5%=!Qmf5`9wzWHTpf@ZeO{BiKOC$UUum(vpMvb z2M`P%|2#NPzJ1!v)%2))rdp-vQ5BBMDj3hsl)q%3JE3=~!Z&GZ@J#`OXcjWL8mA*` zQA?NR+HfT27({_5r^V#ze^4H3zO-gh>JNy{TuC&xKCm()Ys}4#sxtBxpxaiH5pyr= zm#WQz?|I}f*+qFd!OK#fiwL>QVHcb}0;}sOd*Tw=|4%b%->FTeZI;%_AgfQ>k!N^- znI4nrkUbH7FCjOW%JxV}q!Ft+pT|W_HrV$!N~7XSu#xxwak5z%!2M5gHqVA!;@JT@ znCP8|gcM*PeP3av4+I5`{lB@~JFY%f`V6?LSJvHf{BoDP-MmrcThHSy!q^DhlflrY z|4jndBOnph0}Jv@l9{VR2UYH;!&tbK5v7|*QG&tTBGokyrh_xQ>bfpcPBAOAk@;-9 zkN&A+UJ%7%p+0o@fV9{iWQ!uQP`vmTEd*B#%O;Mnk?$CL zz*1(I8SKxpa~2ve2QyYLwd(y^iJg|Y^1>=Blp$G?ez*DQc+}whcD#7+M9#Q;Ur|9` zw7ID^i$)@+m*4k(F93i}&&-qGnv=G@Kd#E+5+rW_&v;D*J2LUv{dcX>lXtXQ`tA#V zfs`(pn8u`PSJWDayMew}EnL8Ll~|v^4bfkxqQ7ub*c)J$ShfpR)Kh}Q=|$OuuGNZ= zky150= z|33svYSggC;lq*Ru8J19a}W)OrsFjogP`1r1^cz(&F==1c3vyuLT>lsb15yDKlV;x zQ??}mrW9uupu=84Lq`A}s@qP=J$~^Sx?5Vd&~TN~V+lsw3|v;+OE>PBk<;if+0QGk zf@~*j%t%{w**IJ+_~pzeGLV-_p5E-GRn2IH*+HaCW5YU=ObqnL&t%fqsn4JpxfH$n zv4gq&)wHl*dPz>W>C0gxy=kVBZIHYe-lDdbvZme>C?Pj(qu5_foo>F>v7aZ#Loo^* z^TxuJ=5X=sM!L5Vg+Cc~_#Im>YbEXc^O#D9hL;PVM)?IfFMl>>?V$AN#bH6$)%lnV zOt`YL>+s%NR5zDf%g%BWMo`t%X`Z9(ZrDWk?J~_*8Oynjg>SVsRINF}vROTbMgZF` zsw;E3tt46zx1G+(gQ4i^`@Y2mZOtF!`3c|dV;20nvf6w2C>G~=@Nx$K<07P??WCp8 zfx@=}inmyjHA+1N`UD`1G+x|KuMDLK;CCnsK#b!_G(}19Ri)ruECS?wNJLB4MAmRA ze7t2q8#8&Nr)uqetP21(qEFA}9T12iInNeL)}81qBQMRO5vjf&#q}UFt@a+=pYSEV zskHesG4WknAEh8CjB&mJd@0XsxfesZyC^D_#CIzW!soA!GD2YxVm2PNjVW*#emA|Z a)|YgI+~iM%xl Date: Wed, 30 Nov 2016 11:51:26 +0000 Subject: [PATCH 12/20] Need to install flocker-ca locally --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 09cf0ca527..2db18bd450 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,9 @@ install: - pip install --requirement requirements/flocker.txt - pip install --requirement requirements/admin.txt - pip install tox awscli + # Install Flocker itself so that run-acceptance-tests has access to flocker-ca + # command + - pip install . env: - FLOCKER_BUILDER=acceptance:aws:centos-7:aws From fb78b51eb6f1e9e0524ed53cce2b0d6720db4854 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 13:01:32 +0000 Subject: [PATCH 13/20] Need flocker-dev requirements for mongo and postgres client libraries used in integration tests --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2db18bd450..49e6e06e56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ before_install: install: - pip install --requirement requirements/flocker.txt + - pip install --requirement requirements/flocker-dev.txt - pip install --requirement requirements/admin.txt - pip install tox awscli # Install Flocker itself so that run-acceptance-tests has access to flocker-ca From 8a16b29655801e356a6297ce89ecfddb7e0c2ba0 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 13:06:38 +0000 Subject: [PATCH 14/20] Re-enable the other builds --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49e6e06e56..bae7f1210c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,18 +35,18 @@ install: env: - FLOCKER_BUILDER=acceptance:aws:centos-7:aws -# - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws -# - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws -# - FLOCKER_BUILDER=lint -# - FLOCKER_BUILDER=docs:lint -# - FLOCKER_BUILDER=docs:spelling -# - FLOCKER_BUILDER=docs:linkcheck -# - FLOCKER_BUILDER=docs:html + - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws + - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws + - FLOCKER_BUILDER=lint + - FLOCKER_BUILDER=docs:lint + - FLOCKER_BUILDER=docs:spelling + - FLOCKER_BUILDER=docs:linkcheck + - FLOCKER_BUILDER=docs:html -# matrix: -# allow_failures: -# - env: FLOCKER_BUILDER=docs:lint -# - env: FLOCKER_BUILDER=docs:linkcheck +matrix: + allow_failures: + - env: FLOCKER_BUILDER=docs:lint + - env: FLOCKER_BUILDER=docs:linkcheck script: - .travis/script From f4b22d90346c7e6cfc11e5ef761b761be9c8c875 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 14:35:36 +0000 Subject: [PATCH 15/20] create a package of travis python utils and share it with the after_script --- .travis.yml | 10 ++-- .travis/flocker_travis/__init__.py | 0 .../after_script.py} | 38 ++++++++------ .travis/flocker_travis/common.py | 41 ++++++++++++++++ .travis/{script => flocker_travis/script.py} | 49 ++++++------------- .travis/setup.py | 16 ++++++ 6 files changed, 102 insertions(+), 52 deletions(-) create mode 100644 .travis/flocker_travis/__init__.py rename .travis/{after_script => flocker_travis/after_script.py} (61%) mode change 100755 => 100644 create mode 100644 .travis/flocker_travis/common.py rename .travis/{script => flocker_travis/script.py} (51%) mode change 100755 => 100644 create mode 100644 .travis/setup.py diff --git a/.travis.yml b/.travis.yml index bae7f1210c..2ac3f5011a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,14 +29,16 @@ install: - pip install --requirement requirements/flocker-dev.txt - pip install --requirement requirements/admin.txt - pip install tox awscli + # Install some Flocker specific Travis-CI tools. + - pip install .travis # Install Flocker itself so that run-acceptance-tests has access to flocker-ca # command - pip install . env: - FLOCKER_BUILDER=acceptance:aws:centos-7:aws - - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws - - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws + # - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws + # - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws - FLOCKER_BUILDER=lint - FLOCKER_BUILDER=docs:lint - FLOCKER_BUILDER=docs:spelling @@ -49,10 +51,10 @@ matrix: - env: FLOCKER_BUILDER=docs:linkcheck script: - - .travis/script + - flocker-travis-script after_script: - - .travis/after_script + - flocker-travis-after-script addons: apt: diff --git a/.travis/flocker_travis/__init__.py b/.travis/flocker_travis/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.travis/after_script b/.travis/flocker_travis/after_script.py old mode 100755 new mode 100644 similarity index 61% rename from .travis/after_script rename to .travis/flocker_travis/after_script.py index 5271f897b9..265da593bb --- a/.travis/after_script +++ b/.travis/flocker_travis/after_script.py @@ -13,9 +13,12 @@ from os import environ from subprocess import call +import sys +from .common import BuildHandler -def publish_staging_docs(build_directory): + +def publish_staging_docs(): """ Copy the HTML generated by the docs-html build to an S3 bucket. """ @@ -37,21 +40,28 @@ def publish_staging_docs(build_directory): return call([ "aws", "--region", "us-east-1", "s3", "sync", "--delete", - "build/" + build_directory, + "build/html", "s3://clusterhq-staging-docs/" + target_directory ]) -HANDLERS = { - "docs:html": publish_staging_docs, -} - - -def main(): - handler_name = environ["FLOCKER_BUILDER"] - handler = HANDLERS.get(handler_name) - if handler: - return handler(handler_name) +def archive_artifacts(*ignored): + return call([ + "aws", "s3", "sync", + "build/", + "/".join([ + "s3://clusterhq-flocker-build-artifacts", + unicode(environ["TRAVIS_BUILD_NUMBER"]), + ]) + ]) -if __name__ == "__main__": - raise SystemExit(main()) +main = BuildHandler( + handlers={ + "docs:html": publish_staging_docs, + "docs": archive_artifacts, + "acceptance": archive_artifacts, + "": lambda *build_labels: sys.stderr.write( + "WARNING: no handler for {}\n".format(build_labels).encode('utf8') + ) + } +).main diff --git a/.travis/flocker_travis/common.py b/.travis/flocker_travis/common.py new file mode 100644 index 0000000000..9be9943774 --- /dev/null +++ b/.travis/flocker_travis/common.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python2 +# +# Copyright ClusterHQ Inc. See LICENSE file for details. + +""" +Run a build step. + +Travis calls this during the `script` phase of its build lifecycle. + * https://docs.travis-ci.com/user/customizing-the-build + +Set ``FLOCKER_BUILDER`` environment variable before calling this script. +""" +from functools import partial +from os import environ + + +class BuildHandler(object): + def __init__(self, handlers, default_handler=None): + self._handlers = handlers + self._default_handler = default_handler + + def _get_handler(self, build_label): + arguments = [] + parts = build_label.split(":") + while True: + key = ":".join(parts) + handler = self._handlers.get(key) + if handler: + break + arguments.append( + parts.pop() + ) + else: + raise KeyError("Handler not found", build_label, self._handlers) + + return partial(handler, *reversed(arguments)) + + def main(self): + build_label = environ["FLOCKER_BUILDER"] + handler = self._get_handler(build_label) + return handler() diff --git a/.travis/script b/.travis/flocker_travis/script.py old mode 100755 new mode 100644 similarity index 51% rename from .travis/script rename to .travis/flocker_travis/script.py index 36bf918b2c..3d07d6043d --- a/.travis/script +++ b/.travis/flocker_travis/script.py @@ -10,11 +10,11 @@ Set ``FLOCKER_BUILDER`` environment variable before calling this script. """ - -from functools import partial -from os import environ +import os from subprocess import call +from .common import BuildHandler + def tox(tox_env): return call(["tox", "-e", tox_env]) @@ -25,43 +25,24 @@ def docs(build_type): def acceptance(provider, distribution, dataset_backend): + build_dir = "build/" + os.environ["FLOCKER_BUILDER"] + os.makedirs(build_dir) command = [ "admin/run-acceptance-tests", "--provider", provider, "--distribution", distribution, "--dataset-backend", dataset_backend, "--config-file", ".travis/secrets/acceptance.yml" + "--", + "flocker.acceptance.endtoend.test_diagnostics", ] - return call(command) - -HANDLERS = { - "acceptance": acceptance, - "lint": tox, - "docs": docs, -} - - -def get_handler(build_label): - arguments = [] - parts = build_label.split(":") - while parts: - key = ":".join(parts) - handler = HANDLERS.get(key) - if handler: - break - arguments.append( - parts.pop() - ) - else: - raise KeyError("Handler not found", build_label, HANDLERS) - - return partial(handler, *arguments) - + return call(command, cwd=build_dir) -def main(): - build_label = environ["FLOCKER_BUILDER"] - handler = get_handler(build_label) - return handler() -if __name__ == "__main__": - raise SystemExit(main()) +main = BuildHandler( + handlers={ + "acceptance": acceptance, + "lint": tox, + "docs": docs, + } +).main diff --git a/.travis/setup.py b/.travis/setup.py new file mode 100644 index 0000000000..1a2b23746c --- /dev/null +++ b/.travis/setup.py @@ -0,0 +1,16 @@ +# Copyright ClusterHQ Inc. See LICENSE file for details. + +""" +A package of Python scripts for use in Travis-CI builds. +""" +from setuptools import setup, find_packages +setup( + name="flocker_travis", + packages=find_packages(), + entry_points={ + 'console_scripts': [ + 'flocker-travis-script = flocker_travis.script:main', + 'flocker-travis-after-script = flocker_travis.after_script:main', + ], + }, +) From 9fe821b85341731d2b538eb7ba52d07c0fa08b63 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 14:53:13 +0000 Subject: [PATCH 16/20] Try and get run-acceptance-test log files in the build directory --- .travis/flocker_travis/after_script.py | 8 ++++---- .travis/flocker_travis/script.py | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis/flocker_travis/after_script.py b/.travis/flocker_travis/after_script.py index 265da593bb..d90be7de38 100644 --- a/.travis/flocker_travis/after_script.py +++ b/.travis/flocker_travis/after_script.py @@ -12,7 +12,7 @@ """ from os import environ -from subprocess import call +from subprocess import call, check_call import sys from .common import BuildHandler @@ -46,12 +46,12 @@ def publish_staging_docs(): def archive_artifacts(*ignored): - return call([ + check_call([ "aws", "s3", "sync", - "build/", + "build", "/".join([ "s3://clusterhq-flocker-build-artifacts", - unicode(environ["TRAVIS_BUILD_NUMBER"]), + environ["TRAVIS_BUILD_NUMBER"], ]) ]) diff --git a/.travis/flocker_travis/script.py b/.travis/flocker_travis/script.py index 3d07d6043d..1c3d807898 100644 --- a/.travis/flocker_travis/script.py +++ b/.travis/flocker_travis/script.py @@ -25,10 +25,14 @@ def docs(build_type): def acceptance(provider, distribution, dataset_backend): - build_dir = "build/" + os.environ["FLOCKER_BUILDER"] + build_dir = "/".join([ + os.environ["TRAVIS_BUILD_DIR"], + "build", + os.environ["FLOCKER_BUILDER"] + ]) os.makedirs(build_dir) command = [ - "admin/run-acceptance-tests", + os.environ["TRAVIS_BUILD_DIR"] + "/admin/run-acceptance-tests", "--provider", provider, "--distribution", distribution, "--dataset-backend", dataset_backend, From 84ab42577cecd68e4c13bd1f270e6312fdb2a539 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 15:03:34 +0000 Subject: [PATCH 17/20] Use a bucket that we might have access to. --- .travis/flocker_travis/after_script.py | 4 +++- .travis/flocker_travis/script.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis/flocker_travis/after_script.py b/.travis/flocker_travis/after_script.py index d90be7de38..686a53c4be 100644 --- a/.travis/flocker_travis/after_script.py +++ b/.travis/flocker_travis/after_script.py @@ -50,8 +50,10 @@ def archive_artifacts(*ignored): "aws", "s3", "sync", "build", "/".join([ - "s3://clusterhq-flocker-build-artifacts", + # XXX Using this because the Jenkins S3 user has access to it. + "s3://clusterhq-dev-archive/flocker/artifacts", environ["TRAVIS_BUILD_NUMBER"], + ]) ]) diff --git a/.travis/flocker_travis/script.py b/.travis/flocker_travis/script.py index 1c3d807898..305c3efc3d 100644 --- a/.travis/flocker_travis/script.py +++ b/.travis/flocker_travis/script.py @@ -36,7 +36,8 @@ def acceptance(provider, distribution, dataset_backend): "--provider", provider, "--distribution", distribution, "--dataset-backend", dataset_backend, - "--config-file", ".travis/secrets/acceptance.yml" + "--config-file", + os.environ["TRAVIS_BUILD_DIR"] + "/.travis/secrets/acceptance.yml", "--", "flocker.acceptance.endtoend.test_diagnostics", ] From 59761d964480859f0ae23aa78706cd384d038b2b Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 15:18:18 +0000 Subject: [PATCH 18/20] Fix the lint command --- .travis/flocker_travis/after_script.py | 3 +++ .travis/flocker_travis/script.py | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis/flocker_travis/after_script.py b/.travis/flocker_travis/after_script.py index 686a53c4be..a1491a18b0 100644 --- a/.travis/flocker_travis/after_script.py +++ b/.travis/flocker_travis/after_script.py @@ -46,6 +46,9 @@ def publish_staging_docs(): def archive_artifacts(*ignored): + """ + Archive everything in the `build/` directory to S3. + """ check_call([ "aws", "s3", "sync", "build", diff --git a/.travis/flocker_travis/script.py b/.travis/flocker_travis/script.py index 305c3efc3d..fd02a594d8 100644 --- a/.travis/flocker_travis/script.py +++ b/.travis/flocker_travis/script.py @@ -24,6 +24,10 @@ def docs(build_type): return tox("docs-" + build_type) +def lint(): + return tox("lint") + + def acceptance(provider, distribution, dataset_backend): build_dir = "/".join([ os.environ["TRAVIS_BUILD_DIR"], @@ -47,7 +51,7 @@ def acceptance(provider, distribution, dataset_backend): main = BuildHandler( handlers={ "acceptance": acceptance, - "lint": tox, + "lint": lint, "docs": docs, } ).main From 8cd9a090cb193110e614f9160eaf739a03b51fa8 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 15:18:45 +0000 Subject: [PATCH 19/20] Enable the other distros --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ac3f5011a..9f1cd669ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,8 @@ install: env: - FLOCKER_BUILDER=acceptance:aws:centos-7:aws - # - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws - # - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws + - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws + - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws - FLOCKER_BUILDER=lint - FLOCKER_BUILDER=docs:lint - FLOCKER_BUILDER=docs:spelling From b68354fd9eb0e314f9cd16bba3d54f9cb4889040 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 30 Nov 2016 15:25:35 +0000 Subject: [PATCH 20/20] Use the correct distribution labels --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f1cd669ef..99f1796285 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,8 @@ install: env: - FLOCKER_BUILDER=acceptance:aws:centos-7:aws - - FLOCKER_BUILDER=acceptance:aws:ubuntu-1604:aws - - FLOCKER_BUILDER=acceptance:aws:ubuntu-1404:aws + - FLOCKER_BUILDER=acceptance:aws:ubuntu-16.04:aws + - FLOCKER_BUILDER=acceptance:aws:ubuntu-14.04:aws - FLOCKER_BUILDER=lint - FLOCKER_BUILDER=docs:lint - FLOCKER_BUILDER=docs:spelling