You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2020/01/13 15:12:18 UTC
[couchdb-infra-cm] branch main updated (c26a384 -> ee7206c)
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-infra-cm.git.
from c26a384 Make Ansible got faster
new 17a0c3c Rework Docker for ppc64le support
new ee7206c Add two ppc64le hosts
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../couchdb-worker-ppc64le-ubuntu-dal-1-01.yml | 10 ++++
.../couchdb-worker-ppc64le-ubuntu-dal-1-02.yml | 10 ++++
production | 40 +++++++++++++++
roles/ci_agent/tasks/docker.yml | 54 --------------------
roles/ci_agent/tasks/main.yml | 58 ++++++++++++++++++++--
ssh.cfg | 18 +++++++
6 files changed, 131 insertions(+), 59 deletions(-)
create mode 100644 host_vars/couchdb-worker-ppc64le-ubuntu-dal-1-01.yml
create mode 100644 host_vars/couchdb-worker-ppc64le-ubuntu-dal-1-02.yml
delete mode 100644 roles/ci_agent/tasks/docker.yml
[couchdb-infra-cm] 01/02: Rework Docker for ppc64le support
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-infra-cm.git
commit 17a0c3cca88e366117da6bd6339558e6688f910a
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Jan 13 09:11:19 2020 -0600
Rework Docker for ppc64le support
---
roles/ci_agent/tasks/docker.yml | 54 --------------------------------------
roles/ci_agent/tasks/main.yml | 58 +++++++++++++++++++++++++++++++++++++----
2 files changed, 53 insertions(+), 59 deletions(-)
diff --git a/roles/ci_agent/tasks/docker.yml b/roles/ci_agent/tasks/docker.yml
deleted file mode 100644
index a63f71f..0000000
--- a/roles/ci_agent/tasks/docker.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-- name: Install Docker gpg key for Apt
- apt_key:
- url: https://download.docker.com/linux/debian/gpg
- state: present
-
-- name: Setup Docker Apt repository
- apt_repository:
- repo: deb https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable
- filename: docker
- state: present
-
-- name: Install Docker Packages
- apt:
- name: "{{ packages }}"
- vars:
- packages:
- - containerd.io
- - docker-ce
- - docker-ce-cli
-
-- name: Install multi-architecture support for Docker
- apt:
- name: "{{ packages }}"
- state: latest
- vars:
- packages:
- - binfmt-support
- - qemu
- - qemu-user-static
-
-- name: Install kill-old-docker.sh
- copy:
- src: kill-old-docker.sh
- dest: /usr/local/bin/kill-old-docker.sh
- mode: 0755
-
-- name: Add kill-old-docker.sh cron entry
- cron:
- name: Kill old docker containers
- hour: '19'
- job: /usr/local/bin/kill-old-docker.sh
-
-- name: Add docker prune cron entry
- cron:
- name: Docker prune
- hour: '19'
- job: /usr/bin/docker system prune -a -f --filter "until=72h"
-
-- name: Add Jenkins user to docker group
- user:
- name: jenkins
- groups:
- - docker
- append: yes
\ No newline at end of file
diff --git a/roles/ci_agent/tasks/main.yml b/roles/ci_agent/tasks/main.yml
index 2f97ab8..6dba9f5 100644
--- a/roles/ci_agent/tasks/main.yml
+++ b/roles/ci_agent/tasks/main.yml
@@ -17,6 +17,58 @@
packages:
- openjdk-8-jre-headless
+- name: Install Docker gpg key for Apt
+ apt_key:
+ url: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg
+ state: present
+
+- name: Setup Docker Apt repository
+ apt_repository:
+ repo: deb https://download.docker.com/linux/{{ansible_distribution | lower}} {{ ansible_distribution_release }} stable
+ filename: docker
+ state: present
+
+- name: Install Docker Packages
+ apt:
+ name: "{{ packages }}"
+ vars:
+ packages:
+ - containerd.io
+ - docker-ce
+
+- name: Install Docker CLI Package on Debian
+ apt:
+ name: docker-ce-cli
+ when: ansible_distribution == 'Debian'
+
+- name: Install multi-architecture support for Docker
+ apt:
+ name: "{{ packages }}"
+ state: latest
+ vars:
+ packages:
+ - binfmt-support
+ - qemu
+ - qemu-user-static
+
+- name: Install kill-old-docker.sh
+ copy:
+ src: kill-old-docker.sh
+ dest: /usr/local/bin/kill-old-docker.sh
+ mode: 0755
+
+- name: Add kill-old-docker.sh cron entry
+ cron:
+ name: Kill old docker containers
+ hour: '19'
+ job: /usr/local/bin/kill-old-docker.sh
+
+- name: Add docker prune cron entry
+ cron:
+ name: Docker prune
+ hour: '19'
+ job: /usr/bin/docker system prune -a -f --filter "until=72h"
+
- name: Add group jenkins
group:
name: jenkins
@@ -28,14 +80,10 @@
uid: 910
groups:
- jenkins
+ - docker
state: present
shell: /bin/bash
-- name: Setup Docker on x86_64 hosts
- include_tasks: docker.yml
- when:
- - ansible_facts['architecture'] == 'x86_64'
-
- name: Create Jenkins runit service directory
file:
path: /etc/sv/jenkins
[couchdb-infra-cm] 02/02: Add two ppc64le hosts
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-infra-cm.git
commit ee7206c6124a725624187570193d6b52e6f5a9b6
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Jan 13 09:11:39 2020 -0600
Add two ppc64le hosts
These Power machines require Ubuntu for Docker support.
---
.../couchdb-worker-ppc64le-ubuntu-dal-1-01.yml | 10 ++++++
.../couchdb-worker-ppc64le-ubuntu-dal-1-02.yml | 10 ++++++
production | 40 ++++++++++++++++++++++
ssh.cfg | 18 ++++++++++
4 files changed, 78 insertions(+)
diff --git a/host_vars/couchdb-worker-ppc64le-ubuntu-dal-1-01.yml b/host_vars/couchdb-worker-ppc64le-ubuntu-dal-1-01.yml
new file mode 100644
index 0000000..ba4b7e3
--- /dev/null
+++ b/host_vars/couchdb-worker-ppc64le-ubuntu-dal-1-01.yml
@@ -0,0 +1,10 @@
+jenkins_secret: !vault |
+ $ANSIBLE_VAULT;1.1;AES256
+ 34353461376636386562646165386536653562653837663037613563396466313764663536316334
+ 3362396632383663626265303062393935376634323339300a386538303566636238343464363864
+ 62363561646638313238313835343634626538363163353663353137363833643662366432616237
+ 6533626133636131390a376439383132646430633332333566386634623935643636663039643737
+ 35323238373733393663363730376465333832356234663132343461303031656439653231303863
+ 37633934356637636339346163626663343337333566633537326664333836643264323131653036
+ 63623636646364363334633535383932396130643130346663343236373866373731353964376261
+ 32393531366434383037
diff --git a/host_vars/couchdb-worker-ppc64le-ubuntu-dal-1-02.yml b/host_vars/couchdb-worker-ppc64le-ubuntu-dal-1-02.yml
new file mode 100644
index 0000000..4758407
--- /dev/null
+++ b/host_vars/couchdb-worker-ppc64le-ubuntu-dal-1-02.yml
@@ -0,0 +1,10 @@
+jenkins_secret: !vault |
+ $ANSIBLE_VAULT;1.1;AES256
+ 30366666363461623639333664613763323437613539653461316431313461383335366331346134
+ 6136326238363734386566343766656261363134623431620a643261613364336164393261336133
+ 38373631653833643466633861626565663064666265653534333864653064313532356333383136
+ 6164393161363161640a336239613861366365653265656634343835323439653364613262633838
+ 36323465396230636464386336396536323735373831363065356534326130386237623764323964
+ 32373435363332386438633563626463313065633661653464653264353436326235343563346563
+ 66613939663362323631653062346435636565373133643130666361613662326338353834363731
+ 31613737336337313234
diff --git a/production b/production
index 9bc042c..0a8cf85 100644
--- a/production
+++ b/production
@@ -23,6 +23,46 @@ all:
ram: 4
ci_agents:
hosts:
+ couchdb-worker-ppc64le-ubuntu-dal-1-01:
+ boot_volume:
+ device: 0717-49f918c4-64ed-45ac-9cfa-44d7e1f61250-5tftj
+ name: couchdb-worker-ppc64le-ubuntu-dal-1-boot
+ instance:
+ created_at: '2020-01-10T18:59:17Z'
+ id: 0717_00d6f517-25e3-417c-b9d5-0d4fa8cde5ac
+ name: couchdb-worker-ppc64le-ubuntu-dal-1-01
+ profile: cp2-4x8
+ subnet: couchdb-ci-farm-dal-1
+ vpc: couchdb-ci-farm-vpc
+ zone: us-south-1
+ ip_addrs:
+ bastion: 169.48.153.153
+ private: 10.240.0.20
+ public: null
+ system:
+ arch: power
+ num_cpus: 4
+ ram: 8
+ couchdb-worker-ppc64le-ubuntu-dal-1-02:
+ boot_volume:
+ device: 0717-8c39f819-0432-49a5-b6d0-97da1e9e4000-h8rrr
+ name: couchdb-worker-ppc64le-02-boot
+ instance:
+ created_at: '2020-01-10T19:04:46Z'
+ id: 0717_a0c8bd5a-5ffe-44da-8058-b2a87180ce9b
+ name: couchdb-worker-ppc64le-ubuntu-dal-1-02
+ profile: cp2-4x8
+ subnet: couchdb-ci-farm-dal-1
+ vpc: couchdb-ci-farm-vpc
+ zone: us-south-1
+ ip_addrs:
+ bastion: 169.48.153.153
+ private: 10.240.0.21
+ public: null
+ system:
+ arch: power
+ num_cpus: 4
+ ram: 8
couchdb-worker-x86-64-debian-dal-1-01:
boot_volume:
device: 0717_72564344-27ce-4e79-91d8-aacfaba35421-vv2gd
diff --git a/ssh.cfg b/ssh.cfg
index 02ab8fe..1d28099 100644
--- a/ssh.cfg
+++ b/ssh.cfg
@@ -7,6 +7,24 @@ Host couchdb-bastion-x86-64-debian-dal-1-1
ControlPath /tmp/ansible-%r@%h:%p
ControlPersist 30m
+Host couchdb-worker-ppc64le-ubuntu-dal-1-01
+ Hostname 10.240.0.20
+ User root
+ StrictHostKeyChecking no
+ ProxyCommand /usr/bin/ssh -F ./ssh.cfg -W %h:%p -q root@169.48.153.153
+ ControlMaster auto
+ ControlPath /tmp/ansible-%r@%h:%p
+ ControlPersist 30m
+
+Host couchdb-worker-ppc64le-ubuntu-dal-1-02
+ Hostname 10.240.0.21
+ User root
+ StrictHostKeyChecking no
+ ProxyCommand /usr/bin/ssh -F ./ssh.cfg -W %h:%p -q root@169.48.153.153
+ ControlMaster auto
+ ControlPath /tmp/ansible-%r@%h:%p
+ ControlPersist 30m
+
Host couchdb-worker-x86-64-debian-dal-1-01
Hostname 10.240.0.4
User root