This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/couchdb-infra-cm.git
The following commit(s) were added to refs/heads/main by this push: new 76d0791 Update x86_64 workers 76d0791 is described below commit 76d0791aa766c1edff3d53d450361a99066ee4ce Author: Nick Vatamaniuc <vatam...@gmail.com> AuthorDate: Tue May 21 01:57:27 2024 -0400 Update x86_64 workers * Switched them to Ubuntu 22.04 and re-created all new instances * Same hardware region/zones --- .../couchdb-worker-x86-64-debian-dal-1-01.yml | 10 --- .../couchdb-worker-x86-64-debian-dal-1-02.yml | 10 --- .../couchdb-worker-x86-64-debian-dal-1-03.yml | 10 --- .../couchdb-worker-x86-64-debian-dal-1-04.yml | 10 --- .../couchdb-worker-x86-64-debian-dal-1-05.yml | 10 --- .../couchdb-worker-x86-64-debian-dal-1-06.yml | 10 --- .../couchdb-worker-x86-64-debian-dal-1-07.yml | 10 --- .../couchdb-worker-x86-64-debian-dal-1-08.yml | 10 --- .../couchdb-worker-x86-64-ubuntu-dal-1-01.yml | 11 +++ .../couchdb-worker-x86-64-ubuntu-dal-1-02.yml | 11 +++ .../couchdb-worker-x86-64-ubuntu-dal-1-03.yml | 10 +++ .../couchdb-worker-x86-64-ubuntu-dal-1-04.yml | 11 +++ .../couchdb-worker-x86-64-ubuntu-dal-1-05.yml | 10 +++ .../couchdb-worker-x86-64-ubuntu-dal-1-06.yml | 10 +++ .../couchdb-worker-x86-64-ubuntu-dal-1-07.yml | 10 +++ .../couchdb-worker-x86-64-ubuntu-dal-1-08.yml | 10 +++ production | 80 +++++++++++----------- roles/ci_agent/tasks/main.yml | 19 +++-- ssh.cfg | 32 ++++----- 19 files changed, 148 insertions(+), 146 deletions(-) diff --git a/host_vars/couchdb-worker-x86-64-debian-dal-1-01.yml b/host_vars/couchdb-worker-x86-64-debian-dal-1-01.yml deleted file mode 100644 index 82ee097..0000000 --- a/host_vars/couchdb-worker-x86-64-debian-dal-1-01.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 37663466623637393365323764643632623833343333623565356563633865383833386562333335 - 3235333066323630353139396166303538313861386466340a636361633833353636653938646133 - 31366532333266326538396134313631356262646535363266646663343063653831386135653861 - 3535373237653431370a373732373836383738616461383931313834323434323637386465363764 - 63666565353964643835326337626538643366616461376566623433633836313932613264383762 - 36636535353535613765613031316563353539646339333234666337396536643963333930326634 - 39313162643063633137626534363865613531363832376437393036633761656662383436626632 - 34623663316438313438 diff --git a/host_vars/couchdb-worker-x86-64-debian-dal-1-02.yml b/host_vars/couchdb-worker-x86-64-debian-dal-1-02.yml deleted file mode 100644 index ce6888d..0000000 --- a/host_vars/couchdb-worker-x86-64-debian-dal-1-02.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 63386161353464336539663432383362303566633139383339383765346232383365663434633931 - 6163373532303733663665653734346636616539393030340a346133666539333835316266326437 - 37383332333232303738306262346433613835393466363638343462316464323065616330623235 - 6561623765343837350a666233623934323439313163383532663833396533333536633637383932 - 65343139323961646339633330376130353361396239623035636435633966383262313764613263 - 33323533333630383130343239343135393433663038626164616166616530363363383632383430 - 39663537326637373565306433333536666464633762616361353331343238616631343332363232 - 38653532333566316435 diff --git a/host_vars/couchdb-worker-x86-64-debian-dal-1-03.yml b/host_vars/couchdb-worker-x86-64-debian-dal-1-03.yml deleted file mode 100644 index 1381399..0000000 --- a/host_vars/couchdb-worker-x86-64-debian-dal-1-03.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 33613736333739616439353932653062383463323761333062376266366166376132336238356633 - 6463373365316234343337386636306262636361366561610a626232303038663230336138343339 - 30633031356132356361386662386238363637643632356463393630383664366637323830326132 - 3635393861336466310a383135633862343062366534653234636435303537613437663861663533 - 32356332656335663936393733356637623434393838653964363764666239323432366238333632 - 38633830376366373439613665396362363466393333643465643062626466383966303238366264 - 35636138633764386265343239393433356131353831636137643638626364363366303964376230 - 66653836306163643433 diff --git a/host_vars/couchdb-worker-x86-64-debian-dal-1-04.yml b/host_vars/couchdb-worker-x86-64-debian-dal-1-04.yml deleted file mode 100644 index cb4092e..0000000 --- a/host_vars/couchdb-worker-x86-64-debian-dal-1-04.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 36356636373264306338636464643163323564366166623261626361623933646433343461333665 - 3135386161323639613233633831653834393234626261380a636536613939663538613032373961 - 34303266623332653962373737663535366233616661313431633733626161653036666464376534 - 3632383539323139380a666362323232313838626131356265393936383931666663643730343864 - 36343238653530373533643561323033396435366134343433623233343539346366353465373830 - 37623765336335646135616236343634376135363633623330636664373335343833376337633739 - 61343330396430383862623664383431363538373933626635646330663135666434333739646234 - 35623531646134656462 diff --git a/host_vars/couchdb-worker-x86-64-debian-dal-1-05.yml b/host_vars/couchdb-worker-x86-64-debian-dal-1-05.yml deleted file mode 100644 index ab76c3c..0000000 --- a/host_vars/couchdb-worker-x86-64-debian-dal-1-05.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 38393833646633616461656532363639376231356432373037363762316131376131373437313138 - 3664653632663735306130643832663030666234376462630a643263316465653430316437313763 - 38363538626166643230653366306664373734623266393633306162663066376532663034376439 - 3265376462646530340a666137633664306638333162613631343266376630653766333031653338 - 64666364386433303266313733333734373233396431663335303864343135663738303532353163 - 33373064353165346538393365363964376434653461303739656461646266636333613362303237 - 64313463393532306237383437346563383732653363613562666135643261303730343334616132 - 34643930653932363330 diff --git a/host_vars/couchdb-worker-x86-64-debian-dal-1-06.yml b/host_vars/couchdb-worker-x86-64-debian-dal-1-06.yml deleted file mode 100644 index 38a859f..0000000 --- a/host_vars/couchdb-worker-x86-64-debian-dal-1-06.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 33653535663863366366633432313234663434326566353066663639363064396631626239356636 - 6231356135353539326430643135316436633732366537390a303934313938336236303164653236 - 34356534356333363930613262353661643037653333333064303332353931356437613438353065 - 6363663832323265390a623662633639666236663335353364356430386136623832623361343437 - 63303738306230326534663736303935373433656663336433343662306439383864643536323039 - 62643762353830383738316431326433633136373462653063636234653932326438633934363135 - 66376131666635623731633539303563626537313266326634633663343634323432613564623230 - 64643335373032326138 diff --git a/host_vars/couchdb-worker-x86-64-debian-dal-1-07.yml b/host_vars/couchdb-worker-x86-64-debian-dal-1-07.yml deleted file mode 100644 index 375e9b5..0000000 --- a/host_vars/couchdb-worker-x86-64-debian-dal-1-07.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 35336233376664386561303534616466363739653266393831313633323662633463353339376533 - 3735386233313837303061373933663038333938636237380a333765393933653562383564613233 - 32643430653730353261623334386463643832303436636130613562333566383137656331316165 - 3530343765396433360a666662643566376336396661646566633034363938386538343165323633 - 31656664646534626133336637643736316639623833613130613330356136656562643934316439 - 35303733376235623238666534636232383231343433366330633233343339353366646130663061 - 39316239366335636235393130663531643363333639383337316461636232663462323163303533 - 62386163623762313262 diff --git a/host_vars/couchdb-worker-x86-64-debian-dal-1-08.yml b/host_vars/couchdb-worker-x86-64-debian-dal-1-08.yml deleted file mode 100644 index e4dbff5..0000000 --- a/host_vars/couchdb-worker-x86-64-debian-dal-1-08.yml +++ /dev/null @@ -1,10 +0,0 @@ -jenkins_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 64326134643565656264336363396631363535623036366630336532343836306236326536363163 - 3363663263653036396331646133363866616331303466660a333763333938313265343763643064 - 36656234636566353430386666643931393634363965373836613439346231376662323537613131 - 6430343661666639370a663264323034353561303134366364613364623064356536386433323462 - 31333964393832356134643932376661393732356566353466616563383730643362343931633837 - 63393037313230326463363938623762626662346330346534366634386639336134396361663364 - 64336364306433303961396630333733353738633366343532383866323334363433373231633834 - 64313438393065383131 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 new file mode 100644 index 0000000..09927a9 --- /dev/null +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-01.yml @@ -0,0 +1,11 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 36633635303132373763613536633936373338626265313866313630663963666334306230653264 + 3430333462623836373761313635343764383931663964370a383361616539623235653465336335 + 65313961316631643135303538646539646632663862313132373233396533376538646466646334 + 6535653963306164650a656437353962643937303938356463363339303165386162653763393462 + 39346266643765633639346661336365626536666537633939633963313861643237663339666236 + 63303766303562653961303635313962616663303561383362643038376436306430303866613664 + 31363234663530303039363239346231626137363030656532656665323338343065666438396630 + 64303037333966356265 + 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 new file mode 100644 index 0000000..6724f55 --- /dev/null +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-02.yml @@ -0,0 +1,11 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 34663938326134613538306661643734643832323663303764333836393739663233623462643035 + 6339343935373764333238396163323339623135656638380a383564326137373939343161356634 + 39366234323635323235623061663836663033396239393533663635663537393062373662313630 + 6563636164363765650a633733333462613261303864656661393066303937303035303366653237 + 34306533336533376563373831333763316238623134666435383232373066323930623234323863 + 34333239616161616231363961613634346163333139633566386263306137653336646566363532 + 32646235663666366339346234363839623838326337323937666139366530666362333561353164 + 39666264666237613266 + 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 new file mode 100644 index 0000000..536e2ec --- /dev/null +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-03.yml @@ -0,0 +1,10 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 36343263313230383937663666313233343331383266313761626136653430303037376235653430 + 3761336336613463343535363664356362616237336566300a383763616139613464346639373532 + 31366362303434626536323261376138363635303864643864373637653931326362633330326233 + 3734326231393839310a626136613065636364666237393432646437366335663531383132633236 + 62363662616364633033326134343039666532326537393136393234626263653538633364626162 + 39313631653936306537333830383236626538393635373839323639396635326164303232633261 + 31396663323438636536633966336635393832643466663830353639333339336265633463396236 + 66383466363765613664 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 new file mode 100644 index 0000000..8d3df47 --- /dev/null +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-04.yml @@ -0,0 +1,11 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 64373435636666313534376265333135356464306463663734353361616635666434643537343665 + 3030313763313333363762613436346335363965323463350a383166646339616136616363663635 + 38363235353332646534663336653335383238626338626339306638363362663332303132663432 + 6362626231653634620a313332333739333138376162346236376331383766333161633339356139 + 63303139353130643232323163663863376431326636306533356364633437396262323563373531 + 37626265643864633965633432646563623761386539663163626431623238636638346238643334 + 37326662636562376430343262656331633630376236613164323833646262396462386566356164 + 33653163633862386537 + 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 new file mode 100644 index 0000000..38014b5 --- /dev/null +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-05.yml @@ -0,0 +1,10 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 38653330346331653164646336316262613735363464393437613030663937316562623264333535 + 3533343761343036313838366338396236376630313431630a663832306363613635313331336139 + 66623262643266393462383730363637313330383764303933386531626530316532353762613561 + 3561616232643330640a636630393334313139656133653461633261303034353061356132366136 + 62633431306164323238633365343362313661653562393762393034623235396335643033353431 + 39383961313765376538653734383734333130323137653865663262393934346466656239383765 + 38636564616566333661363436376661643537346565636363653531623165396533656139353933 + 33356236663666626332 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 new file mode 100644 index 0000000..77e726e --- /dev/null +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-06.yml @@ -0,0 +1,10 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 30356565623831656631303063386534333731373766373532353739373632383263373336643030 + 6330383434343030396631623433376364303337633130300a633733346666663863393766323232 + 62316635316563393132636466633464373862653837336463303466653431363337366139363735 + 6339316136653433380a343038353866333562666437383562396636633462356630336433653263 + 64323533373230663661383931396661353066383033343136383861616432666430306363303565 + 64363331373166633365666136626431343465613736353235663230633061666265343038353031 + 65333139336334363761383334316137363039613937396366356433653339393832626633313763 + 66386332363436356561 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 new file mode 100644 index 0000000..3ade405 --- /dev/null +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-07.yml @@ -0,0 +1,10 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 65643332306130333164336437643836393332616364613034366333363630613236336564623334 + 3461646431316661386439356636326364616539323739660a303462323466346534386335623030 + 65653430613237303434633837366539343431333839363961636639303430646637316131393330 + 3531373331386632330a356564363132633466353565303335623262343536323633303063306135 + 34316138313862623038653861656131323533643436356562336566336665396561356264353738 + 34356162613863646433373233616131626462326636373639323030303938333433323139383961 + 37643130323230336236663663323434616366663164326363393435663130636539393139363862 + 61356131326664666130 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 new file mode 100644 index 0000000..4c9c13a --- /dev/null +++ b/host_vars/couchdb-worker-x86-64-ubuntu-dal-1-08.yml @@ -0,0 +1,10 @@ +jenkins_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 61306531313164396639653261363239313438313731656336363764376562313266393433663064 + 3065393062656633323633653864376261356466396662370a323739323639646439306639303135 + 65383266616537623330623164353532613666366165303231623832343862316131393434326439 + 3937333036343735640a666365373265633564343630643435613061323434376130663433353738 + 33333564623862333239623962663666373864363432386333356331333930393331623639653233 + 64306136313531666431636533326631623635333361636365373331333532366234366166626132 + 61356363343737636561323834623963313738656331633739633361633362303734346433373632 + 63653836313861613264 diff --git a/production b/production index 4770960..2909574 100644 --- a/production +++ b/production @@ -21,11 +21,11 @@ all: user: root ci_agents: hosts: - couchdb-worker-x86-64-debian-dal-1-01: + couchdb-worker-x86-64-ubuntu-dal-1-01: instance: - created_at: '2020-12-04T17:37:42Z' - id: 0717_0380c8b9-988a-4938-aa9d-95ebf50ff9a7 - name: couchdb-worker-x86-64-debian-dal-1-01 + created_at: '2024-05-21T03:39:16Z' + id: 0717_939c6c62-051d-4b3b-9cdd-ffbd0b9cc141 + name: couchdb-worker-x86-64-ubuntu-dal-1-01 profile: cx2-4x8 subnet: couchdb-ci-farm-dal-1 vpc: couchdb-ci-farm-vpc @@ -33,18 +33,18 @@ all: ip_addrs: bastion_host: couchdb-bastion-x86-64-debian-dal-1-01 bastion_ip: 169.48.153.153 - private: 10.240.0.16 + private: 10.240.0.4 public: null system: arch: amd64 num_cpus: 4 ram: 8 user: root - couchdb-worker-x86-64-debian-dal-1-02: + couchdb-worker-x86-64-ubuntu-dal-1-02: instance: - created_at: '2020-12-04T17:37:20Z' - id: 0717_20746912-9251-417a-8b2e-75de411c37a4 - name: couchdb-worker-x86-64-debian-dal-1-02 + created_at: '2024-05-21T04:08:56Z' + id: 0717_36222e4a-1bb6-4344-8906-decfc02e425a + name: couchdb-worker-x86-64-ubuntu-dal-1-02 profile: cx2-4x8 subnet: couchdb-ci-farm-dal-1 vpc: couchdb-ci-farm-vpc @@ -52,18 +52,18 @@ all: ip_addrs: bastion_host: couchdb-bastion-x86-64-debian-dal-1-01 bastion_ip: 169.48.153.153 - private: 10.240.0.15 + private: 10.240.0.5 public: null system: arch: amd64 num_cpus: 4 ram: 8 user: root - couchdb-worker-x86-64-debian-dal-1-03: + couchdb-worker-x86-64-ubuntu-dal-1-03: instance: - created_at: '2020-12-04T17:36:58Z' - id: 0717_c158fd8e-69d9-486d-86a9-094421b5c923 - name: couchdb-worker-x86-64-debian-dal-1-03 + created_at: '2024-05-21T04:10:29Z' + id: 0717_5dfec548-5cde-4c10-8da9-e988c6aa0250 + name: couchdb-worker-x86-64-ubuntu-dal-1-03 profile: cx2-4x8 subnet: couchdb-ci-farm-dal-1 vpc: couchdb-ci-farm-vpc @@ -71,18 +71,18 @@ all: ip_addrs: bastion_host: couchdb-bastion-x86-64-debian-dal-1-01 bastion_ip: 169.48.153.153 - private: 10.240.0.14 + private: 10.240.0.6 public: null system: arch: amd64 num_cpus: 4 ram: 8 user: root - couchdb-worker-x86-64-debian-dal-1-04: + couchdb-worker-x86-64-ubuntu-dal-1-04: instance: - created_at: '2020-12-04T17:36:37Z' - id: 0717_80757f27-9b25-4c33-a2ea-4259e3881d9a - name: couchdb-worker-x86-64-debian-dal-1-04 + created_at: '2024-05-21T04:12:24Z' + id: 0717_4b23ed65-5920-465a-9751-4ff0c8a72e7a + name: couchdb-worker-x86-64-ubuntu-dal-1-04 profile: cx2-4x8 subnet: couchdb-ci-farm-dal-1 vpc: couchdb-ci-farm-vpc @@ -90,18 +90,18 @@ all: ip_addrs: bastion_host: couchdb-bastion-x86-64-debian-dal-1-01 bastion_ip: 169.48.153.153 - private: 10.240.0.13 + private: 10.240.0.7 public: null system: arch: amd64 num_cpus: 4 ram: 8 user: root - couchdb-worker-x86-64-debian-dal-1-05: + couchdb-worker-x86-64-ubuntu-dal-1-05: instance: - created_at: '2020-12-04T17:24:05Z' - id: 0717_c47df357-9178-40c7-a642-01d0ce7a11fa - name: couchdb-worker-x86-64-debian-dal-1-05 + created_at: '2024-05-21T04:15:36Z' + id: 0717_c2cce794-3761-4bf3-b0fd-a7b6baee89bf + name: couchdb-worker-x86-64-ubuntu-dal-1-05 profile: cx2-4x8 subnet: couchdb-ci-farm-dal-1 vpc: couchdb-ci-farm-vpc @@ -109,18 +109,18 @@ all: ip_addrs: bastion_host: couchdb-bastion-x86-64-debian-dal-1-01 bastion_ip: 169.48.153.153 - private: 10.240.0.12 + private: 10.240.0.8 public: null system: arch: amd64 num_cpus: 4 ram: 8 user: root - couchdb-worker-x86-64-debian-dal-1-06: + couchdb-worker-x86-64-ubuntu-dal-1-06: instance: - created_at: '2020-12-04T17:23:32Z' - id: 0717_6976f5a8-05d1-472a-8f12-f667e8de6403 - name: couchdb-worker-x86-64-debian-dal-1-06 + created_at: '2024-05-21T04:16:48Z' + id: 0717_af4b89d8-8e86-43f7-b831-4e860d6d50ac + name: couchdb-worker-x86-64-ubuntu-dal-1-06 profile: cx2-4x8 subnet: couchdb-ci-farm-dal-1 vpc: couchdb-ci-farm-vpc @@ -128,18 +128,18 @@ all: ip_addrs: bastion_host: couchdb-bastion-x86-64-debian-dal-1-01 bastion_ip: 169.48.153.153 - private: 10.240.0.10 + private: 10.240.0.9 public: null system: arch: amd64 num_cpus: 4 ram: 8 user: root - couchdb-worker-x86-64-debian-dal-1-07: + couchdb-worker-x86-64-ubuntu-dal-1-07: instance: - created_at: '2020-12-04T17:22:57Z' - id: 0717_294301e9-30f8-4516-95bd-7c1583cba5f4 - name: couchdb-worker-x86-64-debian-dal-1-07 + created_at: '2024-05-21T04:17:53Z' + id: 0717_b5a27e15-4c40-4144-9a0c-2fb8472fcdae + name: couchdb-worker-x86-64-ubuntu-dal-1-07 profile: cx2-4x8 subnet: couchdb-ci-farm-dal-1 vpc: couchdb-ci-farm-vpc @@ -147,18 +147,18 @@ all: ip_addrs: bastion_host: couchdb-bastion-x86-64-debian-dal-1-01 bastion_ip: 169.48.153.153 - private: 10.240.0.8 + private: 10.240.0.10 public: null system: arch: amd64 num_cpus: 4 ram: 8 user: root - couchdb-worker-x86-64-debian-dal-1-08: + couchdb-worker-x86-64-ubuntu-dal-1-08: instance: - created_at: '2021-03-08T21:13:51Z' - id: 0717_d015b177-e247-4c10-9fdd-a06009127409 - name: couchdb-worker-x86-64-debian-dal-1-08 + created_at: '2024-05-21T04:19:16Z' + id: 0717_8574a26c-2374-489f-955a-a746ead09a57 + name: couchdb-worker-x86-64-ubuntu-dal-1-08 profile: cx2-4x8 subnet: couchdb-ci-farm-dal-1 vpc: couchdb-ci-farm-vpc @@ -166,7 +166,7 @@ all: ip_addrs: bastion_host: couchdb-bastion-x86-64-debian-dal-1-01 bastion_ip: 169.48.153.153 - private: 10.240.0.4 + private: 10.240.0.11 public: null system: arch: amd64 diff --git a/roles/ci_agent/tasks/main.yml b/roles/ci_agent/tasks/main.yml index e54767b..a2bc192 100644 --- a/roles/ci_agent/tasks/main.yml +++ b/roles/ci_agent/tasks/main.yml @@ -20,18 +20,17 @@ packages: - openjdk-11-jre-headless -- name: Install Docker gpg key for Apt +- name: Setup Docker APT repository become: yes - apt_key: - url: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg - state: present - -- name: Setup Docker Apt repository - become: yes - apt_repository: - repo: deb https://download.docker.com/linux/{{ansible_distribution | lower}} {{ ansible_distribution_release }} stable - filename: docker + ansible.builtin.deb822_repository: + name: docker state: present + types: [deb] + uris: "https://download.docker.com/linux/{{ ansible_distribution|lower }}" + suites: ["{{ ansible_distribution_release|lower }}"] + components: [stable] + signed_by: "https://download.docker.com/linux/debian/gpg" + enabled: yes - name: Install Docker Packages become: yes diff --git a/ssh.cfg b/ssh.cfg index 1749bbb..a7f0a65 100644 --- a/ssh.cfg +++ b/ssh.cfg @@ -7,50 +7,50 @@ Host couchdb-bastion-x86-64-debian-dal-1-01 ControlPath /tmp/ansible-%r@%h:%p ControlPersist 30m -Host couchdb-worker-x86-64-debian-dal-1-01 - Hostname 10.240.0.16 +Host couchdb-worker-x86-64-ubuntu-dal-1-01 + Hostname 10.240.0.4 User root StrictHostKeyChecking no ProxyCommand /usr/bin/ssh -W %h:%p -q root@couchdb-bastion-x86-64-debian-dal-1-01 -Host couchdb-worker-x86-64-debian-dal-1-02 - Hostname 10.240.0.15 +Host couchdb-worker-x86-64-ubuntu-dal-1-02 + Hostname 10.240.0.5 User root StrictHostKeyChecking no ProxyCommand /usr/bin/ssh -W %h:%p -q root@couchdb-bastion-x86-64-debian-dal-1-01 -Host couchdb-worker-x86-64-debian-dal-1-03 - Hostname 10.240.0.14 +Host couchdb-worker-x86-64-ubuntu-dal-1-03 + Hostname 10.240.0.6 User root StrictHostKeyChecking no ProxyCommand /usr/bin/ssh -W %h:%p -q root@couchdb-bastion-x86-64-debian-dal-1-01 -Host couchdb-worker-x86-64-debian-dal-1-04 - Hostname 10.240.0.13 +Host couchdb-worker-x86-64-ubuntu-dal-1-04 + Hostname 10.240.0.7 User root StrictHostKeyChecking no ProxyCommand /usr/bin/ssh -W %h:%p -q root@couchdb-bastion-x86-64-debian-dal-1-01 -Host couchdb-worker-x86-64-debian-dal-1-05 - Hostname 10.240.0.12 +Host couchdb-worker-x86-64-ubuntu-dal-1-05 + Hostname 10.240.0.8 User root StrictHostKeyChecking no ProxyCommand /usr/bin/ssh -W %h:%p -q root@couchdb-bastion-x86-64-debian-dal-1-01 -Host couchdb-worker-x86-64-debian-dal-1-06 - Hostname 10.240.0.10 +Host couchdb-worker-x86-64-ubuntu-dal-1-06 + Hostname 10.240.0.9 User root StrictHostKeyChecking no ProxyCommand /usr/bin/ssh -W %h:%p -q root@couchdb-bastion-x86-64-debian-dal-1-01 -Host couchdb-worker-x86-64-debian-dal-1-07 - Hostname 10.240.0.8 +Host couchdb-worker-x86-64-ubuntu-dal-1-07 + Hostname 10.240.0.10 User root StrictHostKeyChecking no ProxyCommand /usr/bin/ssh -W %h:%p -q root@couchdb-bastion-x86-64-debian-dal-1-01 -Host couchdb-worker-x86-64-debian-dal-1-08 - Hostname 10.240.0.4 +Host couchdb-worker-x86-64-ubuntu-dal-1-08 + Hostname 10.240.0.11 User root StrictHostKeyChecking no ProxyCommand /usr/bin/ssh -W %h:%p -q root@couchdb-bastion-x86-64-debian-dal-1-01