This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch add-new-do-worker in repository https://gitbox.apache.org/repos/asf/couchdb-infra-cm.git
commit b75660c2a0d28a57d2711f0673053348fd856e0d Author: Nick Vatamaniuc <[email protected]> AuthorDate: Fri Mar 20 16:16:31 2026 -0400 Replace DO worker Thank you to Digital Ocean! (And Ronny, for setting it up) Fix Ansible deprecations Fix a few warnings and errors (sshd vs ssh daemon) Update jenkins agent setup to not use jnlp. This required updating all host_vars. --- ansible.cfg | 1 + host_vars/asfminidebian.yml | 18 ++++++++---------- host_vars/couchdb-worker-x86-64-ubuntu-dal-1-01.yml | 17 ++++++++--------- host_vars/couchdb-worker-x86-64-ubuntu-dal-1-02.yml | 17 ++++++++--------- host_vars/couchdb-worker-x86-64-ubuntu-dal-1-03.yml | 16 ++++++++-------- host_vars/couchdb-worker-x86-64-ubuntu-dal-1-04.yml | 17 ++++++++--------- host_vars/couchdb-worker-x86-64-ubuntu-dal-1-05.yml | 16 ++++++++-------- host_vars/couchdb-worker-x86-64-ubuntu-dal-1-06.yml | 16 ++++++++-------- host_vars/couchdb-worker-x86-64-ubuntu-dal-1-07.yml | 16 ++++++++-------- host_vars/couchdb-worker-x86-64-ubuntu-dal-1-08.yml | 16 ++++++++-------- host_vars/linux1.yml | 17 ++++++++--------- host_vars/ubuntu-c-4-nyc3-01.yml | 10 ++++++++++ host_vars/ubuntu-fra1-10.yml | 10 ---------- host_vars/ubuntu-fsn-1-09.yml | 16 ++++++++-------- host_vars/ubuntu-nc-arm64-12.yml | 17 ++++++++--------- host_vars/ubuntu-nc-x86-11.yml | 18 ++++++++---------- host_vars/ubuntu.yml | 16 ++++++++-------- production | 8 ++++---- requirements.txt | 2 +- roles/ci_agent/tasks/main.yml | 6 +++--- roles/ci_agent/templates/runit-main.j2 | 4 ++-- roles/common/handlers/main.yml | 2 +- roles/common/tasks/main.yml | 2 +- ssh.cfg | 4 ++-- 24 files changed, 137 insertions(+), 145 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index f878210..a271532 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -3,6 +3,7 @@ inventory = ./production vault_password_file = ~/.couchdb-ansible-vault forks = 10 interpreter_python = /usr/bin/python3 +deprecation_warnings = False [ssh_connection] ssh_args = -F ./ssh.cfg diff --git a/host_vars/asfminidebian.yml b/host_vars/asfminidebian.yml index e940ade..d7b3b9e 100644 --- a/host_vars/asfminidebian.yml +++ b/host_vars/asfminidebian.yml @@ -1,12 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 33343462643836636134363234383764356135656437316238373232343465653636613866666338 - 3232633731313861623063366263636136636263383133620a326131303831663036353835353161 - 66653834353539393338346563356665363630326533346336616630646334343836306364663962 - 6664323933613931650a636231343166333232383830373765376262303166633064633630613234 - 35373735326266376334373363323361646262656334383038323430633537613264616638316531 - 33313333626461613435303933313633383930656534636531383939333065343165333334613430 - 66346639623231373061626164343463613432623164303936343937663465633461653338396565 - 38636330623532383931 - - + 39653830303437323535313363623931613731383166373431666163383534643366633864366332 + 3236646461383530646538343733343531666230353762360a616263303161343665383665393265 + 39363762313232636266636663643235663134386665323166323132373365333764653333653765 + 3763376536383962320a623736356332376238313435343333366535306237303339633137666463 + 35653762383161313062623564376231353564663466383364626637633535353264396534326265 + 32633838613063663166386665373336323135313338396464346231323763343866643262663136 + 31656333386538383837363564353935323561316664613230653161643731313039336264396336 + 39383635383066343033 diff --git a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-01.yml b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-01.yml index 09927a9..5d56ae8 100644 --- a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-01.yml +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-01.yml @@ -1,11 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 36633635303132373763613536633936373338626265313866313630663963666334306230653264 - 3430333462623836373761313635343764383931663964370a383361616539623235653465336335 - 65313961316631643135303538646539646632663862313132373233396533376538646466646334 - 6535653963306164650a656437353962643937303938356463363339303165386162653763393462 - 39346266643765633639346661336365626536666537633939633963313861643237663339666236 - 63303766303562653961303635313962616663303561383362643038376436306430303866613664 - 31363234663530303039363239346231626137363030656532656665323338343065666438396630 - 64303037333966356265 - + 39646335393661306365313163633436336134353863393235383131393862653131376437333434 + 3063613062366164366237643862356563643762383665310a393562373337343766323762366630 + 38333561616335616234353662353965343339376533313832653662643138346234656439646234 + 3330363262316633640a623831623538656162656335313566303634333061663135306135663536 + 63306136306563303064643431303062636565663730303164353061353965626462653430393335 + 61626338306631303963386565363431333136356237633062623633336236633732643866656231 + 35656366613663656164313933616235333332656233653939636661343561346334313431396432 + 39646263313231396638 diff --git a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-02.yml b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-02.yml index 6724f55..f2ab8fd 100644 --- a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-02.yml +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-02.yml @@ -1,11 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 34663938326134613538306661643734643832323663303764333836393739663233623462643035 - 6339343935373764333238396163323339623135656638380a383564326137373939343161356634 - 39366234323635323235623061663836663033396239393533663635663537393062373662313630 - 6563636164363765650a633733333462613261303864656661393066303937303035303366653237 - 34306533336533376563373831333763316238623134666435383232373066323930623234323863 - 34333239616161616231363961613634346163333139633566386263306137653336646566363532 - 32646235663666366339346234363839623838326337323937666139366530666362333561353164 - 39666264666237613266 - + 66393961666338316635326235393138623931373734396264356664653432616666633733656438 + 3930643837366230326161613132613666646162376661380a613531326331333933343862313864 + 64326538663830646535376638643863306466393362656134336531613761366439303130326331 + 6439386164643039360a376561663732326635656333653830613434323865323032356266363565 + 35373366643531366130386464636131363137666436313232363465303162353762313464386233 + 63303431366436373538356638383566623834636163393562386237623730613230623338663134 + 39363737666534336233373034633830326531373265343939336536313034383364613032326132 + 61353430366433383766 diff --git a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-03.yml b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-03.yml index 536e2ec..55aba86 100644 --- a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-03.yml +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-03.yml @@ -1,10 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 36343263313230383937663666313233343331383266313761626136653430303037376235653430 - 3761336336613463343535363664356362616237336566300a383763616139613464346639373532 - 31366362303434626536323261376138363635303864643864373637653931326362633330326233 - 3734326231393839310a626136613065636364666237393432646437366335663531383132633236 - 62363662616364633033326134343039666532326537393136393234626263653538633364626162 - 39313631653936306537333830383236626538393635373839323639396635326164303232633261 - 31396663323438636536633966336635393832643466663830353639333339336265633463396236 - 66383466363765613664 + 64343034623830333735653030316238366163643630373239346565346339393833346533633230 + 6430393136303330616532633363393062393831303339360a373735383634636430396337326636 + 33353262663361373330626365303834323635326439666565323833346233353230336364366531 + 3332343935613335660a623039346433323436396465303239636363636432343138653563303263 + 35643066346231323338623939373731643761386333353331353935643536626362316635666539 + 31366230663138343636373131613837393937336363363933386562623330353438336533653531 + 36383536613461663831323135303731363166633631326166383435626432353731376261636330 + 31326130393733386563 diff --git a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-04.yml b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-04.yml index 8d3df47..0feaea9 100644 --- a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-04.yml +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-04.yml @@ -1,11 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 64373435636666313534376265333135356464306463663734353361616635666434643537343665 - 3030313763313333363762613436346335363965323463350a383166646339616136616363663635 - 38363235353332646534663336653335383238626338626339306638363362663332303132663432 - 6362626231653634620a313332333739333138376162346236376331383766333161633339356139 - 63303139353130643232323163663863376431326636306533356364633437396262323563373531 - 37626265643864633965633432646563623761386539663163626431623238636638346238643334 - 37326662636562376430343262656331633630376236613164323833646262396462386566356164 - 33653163633862386537 - + 34316237383236396161383462626139646363666531343834626466396134336664356362336665 + 3530653464333563626463646239303964373662626538340a303835666131623034613439666565 + 63656132393633396635636361636637623032363837356233306561323364643364373061666661 + 3038616562346434340a626433316131653838346130393831616433363432366363343532623933 + 33376430666330313039636436356233643930383961393166626133363164666566303038633331 + 35356233623135376262653330626531666131363534636438616531373135623966393164373565 + 37356462623639636165393061366164396136343430333066633235636232613766376265316535 + 36373730373835373636 diff --git a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-05.yml b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-05.yml index 38014b5..1d4a308 100644 --- a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-05.yml +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-05.yml @@ -1,10 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 38653330346331653164646336316262613735363464393437613030663937316562623264333535 - 3533343761343036313838366338396236376630313431630a663832306363613635313331336139 - 66623262643266393462383730363637313330383764303933386531626530316532353762613561 - 3561616232643330640a636630393334313139656133653461633261303034353061356132366136 - 62633431306164323238633365343362313661653562393762393034623235396335643033353431 - 39383961313765376538653734383734333130323137653865663262393934346466656239383765 - 38636564616566333661363436376661643537346565636363653531623165396533656139353933 - 33356236663666626332 + 34626133666230303630363563636663356336323537616637643132383737376464363765383462 + 3366643063313236643730333936393063666334323935340a346234643433333933336231363738 + 35333563626361366163373039373538333966353933316332393532613561313934663437346431 + 6631373166346532370a386635613866623939613734633364366639656139656334386233376565 + 31636232333036376365383466653535316437376161386135323733656536373835663566366465 + 36613538366138326233386631373438323238326333623036396564356634386338303135343064 + 30303337666531623639626165623036616335623830333931643731663761626537366264353931 + 61343031366237333539 diff --git a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-06.yml b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-06.yml index 77e726e..830f8e0 100644 --- a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-06.yml +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-06.yml @@ -1,10 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 30356565623831656631303063386534333731373766373532353739373632383263373336643030 - 6330383434343030396631623433376364303337633130300a633733346666663863393766323232 - 62316635316563393132636466633464373862653837336463303466653431363337366139363735 - 6339316136653433380a343038353866333562666437383562396636633462356630336433653263 - 64323533373230663661383931396661353066383033343136383861616432666430306363303565 - 64363331373166633365666136626431343465613736353235663230633061666265343038353031 - 65333139336334363761383334316137363039613937396366356433653339393832626633313763 - 66386332363436356561 + 66623630653535383935623366336631633838373065626631343337623665363564303565346531 + 3839636438333933393133633562353237333834353964610a383235316639613435343434643639 + 32343535303765323632313138633838656138336365376361623261396466663138346235643234 + 3333356663336533370a643539336537326336663431346365323333656638626333636364303864 + 31626430303061303165333739613835663731643063653663396164663732616339376635356131 + 36636232353038306635306435616566653364666261333630306432653465303765323139353562 + 35383136316666326266613665373135316164306162653630366635376166323464633438643237 + 31393038313035383531 diff --git a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-07.yml b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-07.yml index 3ade405..6a623fd 100644 --- a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-07.yml +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-07.yml @@ -1,10 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 65643332306130333164336437643836393332616364613034366333363630613236336564623334 - 3461646431316661386439356636326364616539323739660a303462323466346534386335623030 - 65653430613237303434633837366539343431333839363961636639303430646637316131393330 - 3531373331386632330a356564363132633466353565303335623262343536323633303063306135 - 34316138313862623038653861656131323533643436356562336566336665396561356264353738 - 34356162613863646433373233616131626462326636373639323030303938333433323139383961 - 37643130323230336236663663323434616366663164326363393435663130636539393139363862 - 61356131326664666130 + 32643465363837363964623031336261386537663838303037636634396530653236613537393533 + 3830303962366532356666346238316532383333343532370a306339653562323032326333646336 + 66613636333061323165353939316434326234633038626437306536633264633136653130306234 + 3063376436626563370a663636613266323933386136333831633430363230616531663839623931 + 64636339373033623061393930653235656262643732343466626639326333396431653963333539 + 38393561306130323135316161613666316338336666616432386434356134333063343434303638 + 32343330303566663531663230643633353830643461626437616261393833393137326336366434 + 39303165396339653334 diff --git a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-08.yml b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-08.yml index 4c9c13a..019a3fd 100644 --- a/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-08.yml +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-08.yml @@ -1,10 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 61306531313164396639653261363239313438313731656336363764376562313266393433663064 - 3065393062656633323633653864376261356466396662370a323739323639646439306639303135 - 65383266616537623330623164353532613666366165303231623832343862316131393434326439 - 3937333036343735640a666365373265633564343630643435613061323434376130663433353738 - 33333564623862333239623962663666373864363432386333356331333930393331623639653233 - 64306136313531666431636533326631623635333361636365373331333532366234366166626132 - 61356363343737636561323834623963313738656331633739633361633362303734346433373632 - 63653836313861613264 + 66333764653766373564653865306333623461323064383632343631346362643633393236633439 + 6562386163376236383635353735356339353232376431350a633634613164616163363265353466 + 30666361373662343330386461646564663632643238346336653332353437373838313239386237 + 3561376561643034310a323938366566653764333433333738613261656230376633313239653934 + 33353062373862376463326139356364653264326537616265383331613566636263396130613034 + 64613238626233393161363666303865386130336532383938656434613532613733336461343631 + 38343037383665333037633036613431333765393934393864306634313763393733363436643539 + 31316432396333663235 diff --git a/host_vars/linux1.yml b/host_vars/linux1.yml index 26b41be..b2e4d33 100644 --- a/host_vars/linux1.yml +++ b/host_vars/linux1.yml @@ -1,11 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 36393331323763646562303933636631613363656334333066303437633634353361376438336639 - 6331616461346531613862653037666537343163353266380a376239396563316337313563623432 - 33343466323632613363363734643761623066613866366230636636356664613265386631636435 - 3761306238616266620a633532333432643761363865663531323034363234343264343939346536 - 61376631366537623264653730666633636433646636386161393531333965643761323463383633 - 38353639393237663634373038633862653265376562313830353764646132646534613834663831 - 62343166376439616233316635323530623934666435336264343263346434343834313461383630 - 63616139636362396265 - + 35633137386138363735396237333134316438306538636234663333366636396239666439343064 + 3231376137643864633630386530346364663332333831360a623630346631353935323566313434 + 64396130633266316165613461336433303431343931643165376566616438616362373534613732 + 3239386531393366370a333032306466663561666631646638623664313234363435373035303134 + 66643564653031386430666635326366636234633362643964383739626462363131343832656133 + 35393064343664316264383237313161333263356663373333626532656335353535653461643563 + 31313962303061373036616137633438383636626135366266363534623435643637363266316630 + 63643665653734343030 diff --git a/host_vars/ubuntu-c-4-nyc3-01.yml b/host_vars/ubuntu-c-4-nyc3-01.yml new file mode 100644 index 0000000..1cfebed --- /dev/null +++ b/host_vars/ubuntu-c-4-nyc3-01.yml @@ -0,0 +1,10 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 33663335646137323638303436353866393330663532636633663662646661353330623639383362 + 3761333539633637626539666661653938316433623635360a636434643432353930613835353263 + 65386631646666356661303436396235353461306361636366326132306134383736373665393539 + 3236303963323532620a303134393664663630633736333661393665626430613239613030653438 + 65643933323736393537633937656439353262306638313832653762393532623561633931383639 + 30353036376162303037626433336134396136326630363732616562383737653631316166626464 + 65663635353364383433376530313432613466633866626631313130383636336363303532633864 + 65633038323138376365 diff --git a/host_vars/ubuntu-fra1-10.yml b/host_vars/ubuntu-fra1-10.yml deleted file mode 100644 index aaa0c74..0000000 --- a/host_vars/ubuntu-fra1-10.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 63326366653961396365383737306135373964316230346563323430396332373965336531626238 - 3937353739343563333134616366386166313838323839360a613736653864383566353065323839 - 65386663646366316536373230636236323462366335616536303061376136613161333162386131 - 3363376532383234360a613563663964376430626437636132656234646239343337656638383639 - 36663736353438626338343835383633333164303861373832653635613065346239316330656531 - 33363034353130643430383536623033343162346661396436313132616365313038323462333438 - 33353864373136633135353461613635633636643933316633323734386463663766626336666339 - 62373330393338613962 diff --git a/host_vars/ubuntu-fsn-1-09.yml b/host_vars/ubuntu-fsn-1-09.yml index f7a5678..54d7188 100644 --- a/host_vars/ubuntu-fsn-1-09.yml +++ b/host_vars/ubuntu-fsn-1-09.yml @@ -1,10 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 31303039326261383861656332383664376133303264343366336266396666303038373037363836 - 6535343734623163326336643037306433363132333464350a393630333131313663663135646463 - 62356238313932363539643565663732303636326466333165633563646162386234616364363066 - 6138376266323663650a336431376333363837663964333265626634656333626532393234643830 - 37313762333736343239623962306165663334303139383962346134396330613430623938663337 - 30323064623166356566633536353564633039306538646164396166366562373264316362336366 - 30383235646561363365623130393231623237643735653562346564356239383634346261376564 - 36623237376438666363 + 32303363316339373166346337616435656365646332313835376133656233616637313063643434 + 6630383261666134616461343863373133653761343239300a626235663732316662336633343162 + 39353633373664643763326463656439623734323332333439663565626633613433323839306332 + 6366323839646434320a333235326366656336613230383864363034663064623036376663343836 + 38656536653236343266366432646461303935363264653734393661363762313636343364663435 + 63316130363861376533653163623931386561363464383137316665366562666135646561346266 + 64386231383237656164353263363064366437393033643136656236326630643239643361613532 + 37396130636630663162 diff --git a/host_vars/ubuntu-nc-arm64-12.yml b/host_vars/ubuntu-nc-arm64-12.yml index 356ad13..bf1ecfb 100644 --- a/host_vars/ubuntu-nc-arm64-12.yml +++ b/host_vars/ubuntu-nc-arm64-12.yml @@ -1,11 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 66376661626339613764373737636563626333396234643165633339666632353366383465313466 - 3731346132613831393562343465363837316233653663320a383839633433396231656630356631 - 63633064316332326334363266663866346530386633366563353063643735623335336635623433 - 3031666666393034310a613662303564643937623666343863393630376534656466653639333636 - 62663064613631343735323333393030656131646339666438616666386466653135336262353062 - 61666264633866653236376336646135383935303364366661353437353738346637646363363933 - 65313635643437626662343638393764653262303236653663303766653336346464636433363739 - 37393031316531666566 - + 30306633363231636133366361363333316439373639393465353138353136376565653564356463 + 3363663639373961366535363330373030666630356632660a666434363939333865353738346138 + 34616437343337316134376161333637666338343162616231353738633665336535333231303536 + 3665656161303164370a373235336265303962666662393566653336663439363032653635363532 + 62393965616530656131343761373564663962336133633737633130353738663932613138633531 + 30653031316531323336616561386439376666623338303137656265336665343434343666316531 + 31396438663036376234313531613561326634633565386336363437336365326462313339386635 + 34633638656662326238 diff --git a/host_vars/ubuntu-nc-x86-11.yml b/host_vars/ubuntu-nc-x86-11.yml index 7c99736..bfce8c0 100644 --- a/host_vars/ubuntu-nc-x86-11.yml +++ b/host_vars/ubuntu-nc-x86-11.yml @@ -1,12 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 35373133313338353665366630303438613663373166333538633239613836313961666463643339 - 6164336532353233356661666331383066306139623036380a393862336465363766633438323036 - 65343233633638346631663730626430376231396265623431636134626561303837373730623933 - 6333653237353664330a343334313362643363656631353364623232643462636565616632393032 - 30346637373937646531663865373032313039313665633465396562656536333162323633303638 - 62303266633665363338316564373636366163643464663033383734326561646632353930323865 - 32356139643033323837623035616335653939333132363532363538613739353532663032663232 - 39356334303236313864 - - + 63366337616661663163393065616437653437343062366139343732356136373239363838323463 + 6336303134633030666136663935663762646637386630640a653337343931663964373937313763 + 65656161343032383734613535383231303365316336393437303138363562306332656162623361 + 3062356132396163610a316438373132316434656132323434643336376632313434646539313132 + 63323033376163303261373865333530313137663034666430633331633064313231613066346535 + 39663933326539636266643465666363323132363165376566623834326339643530376635343831 + 66633061663263306565633266663863396232626437336562316165616163613031313862643664 + 34333234363438663330 diff --git a/host_vars/ubuntu.yml b/host_vars/ubuntu.yml index e0f2710..5113d8f 100644 --- a/host_vars/ubuntu.yml +++ b/host_vars/ubuntu.yml @@ -1,10 +1,10 @@ jenkins_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 30323762353066356462386238343334636538333135353064356538333761346131366164393936 - 3265306438386237383765336133343837393339396437360a333838326437303235396264303038 - 62643762633539333431336166633930373437313432613764646633303430646637613736623131 - 3765376233653439320a323366323536643066623966383361353539326164343539303964393131 - 66373261396536396665646437323438663364336165326238366238383435386431353135666263 - 32656238623162623837313766633136373938353665353263366665663836396234343930303264 - 63373365346332623461336563353531303937653536396364306261343039396439343564373762 - 30623234656239666636 + 39373766633231643333336264666337376231323339353437646231623238633237343532323131 + 6439663235386634663062663032323161616365636533340a343834656639393666626138376463 + 38366533656566623266316633323163656339643339306266636235646165306138663239313437 + 3035666363333638390a383066613465666664353864333466613362373038316632356634313838 + 30373936356464663138393833393433393535316235653561393437613139636638626438303064 + 61616437633536323532363431373835383236353865623963373765333736383366306131306638 + 35633730666564366130363636366164353535313937653136356537363439653236353166323162 + 63333663663862356532 diff --git a/production b/production index ad9cf68..e0cccde 100644 --- a/production +++ b/production @@ -223,15 +223,15 @@ all: num_cpus: 8 ram: 16 user: ubuntu - ubuntu-fra1-10: + ubuntu-c-4-nyc3-01: instance: - id: ubuntu-fra1-10 - name: ubuntu-fra1-10 + id: ubuntu-c-4-nyc3-01 + name: ubuntu-c-4-nyc3-01 subnet: null ip_addrs: bastion_host: null bastion_ip: null - public: 67.207.77.129 + public: 129.212.147.196 system: arch: x86_64 num_cpus: 4 diff --git a/requirements.txt b/requirements.txt index 8bf65d1..5c4a6bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -ansible +ansible>=2.16 requests diff --git a/roles/ci_agent/tasks/main.yml b/roles/ci_agent/tasks/main.yml index 0201875..4f3eb40 100644 --- a/roles/ci_agent/tasks/main.yml +++ b/roles/ci_agent/tasks/main.yml @@ -26,8 +26,8 @@ name: docker state: present types: [deb] - uris: "https://download.docker.com/linux/{{ ansible_distribution|lower }}" - suites: ["{{ ansible_distribution_release|lower }}"] + uris: "https://download.docker.com/linux/{{ ansible_facts['distribution']|lower }}" + suites: ["{{ ansible_facts['distribution_release']|lower }}"] components: [stable] signed_by: "https://download.docker.com/linux/debian/gpg"; enabled: yes @@ -46,7 +46,7 @@ become: yes apt: name: docker-ce-cli - when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu' + when: ansible_facts['distribution'] == 'Debian' or ansible_facts['distribution'] == 'Ubuntu' - name: Install multi-architecture support for Docker become: yes diff --git a/roles/ci_agent/templates/runit-main.j2 b/roles/ci_agent/templates/runit-main.j2 index beed70a..4dd93ad 100644 --- a/roles/ci_agent/templates/runit-main.j2 +++ b/roles/ci_agent/templates/runit-main.j2 @@ -1,6 +1,6 @@ #!/bin/sh exec 2>&1 cd /home/jenkins -curl https://ci-couchdb.apache.org/jnlpJars/agent.jar --output /home/jenkins/agent.jar +curl -sO https://ci-couchdb.apache.org/jnlpJars/agent.jar chown jenkins:jenkins /home/jenkins/agent.jar -exec chpst -u jenkins:jenkins:docker java -jar agent.jar -jnlpUrl https://ci-couchdb.apache.org/computer/{{ hostvars[inventory_hostname]["instance"]["name"] }}/jenkins-agent.jnlp -secret {{ jenkins_secret }} -workDir "/home/jenkins" +exec chpst -u jenkins:jenkins:docker java -jar agent.jar -url https://ci-couchdb.apache.org/ -secret "{{ jenkins_secret }}" -name "{{ hostvars[inventory_hostname]["instance"]["name"] }}" -workDir "/home/jenkins" diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index 574f881..a297578 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -1,5 +1,5 @@ - name: restart sshd become: yes service: - name: sshd + name: "{{ 'ssh' if ansible_facts['distribution'] in ['Debian', 'Ubuntu'] else 'sshd' }}" state: restarted diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index bba9d4d..60a17af 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,6 +1,6 @@ - name: Allow CouchDB Infra access authorized_key: - user: "{{ ansible_user_id }}" + user: "{{ ansible_facts['user_id'] }}" state: present key: "{{ item }}" with_items: diff --git a/ssh.cfg b/ssh.cfg index 66dc7d5..2b14192 100644 --- a/ssh.cfg +++ b/ssh.cfg @@ -89,8 +89,8 @@ Host ubuntu ControlPath /tmp/ansible-%r@%h:%p ControlPersist 30m -Host ubuntu-fra1-10 - Hostname 67.207.77.129 +Host ubuntu-c-4-nyc3-01 + Hostname 129.212.147.196 User root ForwardAgent yes StrictHostKeyChecking no
