Erlang 18.2 -> 18.3 (required for Ubuntu 16.04 support)
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/399a8e08 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/399a8e08 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/399a8e08 Branch: refs/heads/master Commit: 399a8e0804495afcedf7d3bc756e22dc9ee81108 Parents: 3ee4655 Author: Joan Touzet <woh...@apache.org> Authored: Wed Mar 22 17:02:12 2017 -0700 Committer: Joan Touzet <woh...@apache.org> Committed: Wed Mar 22 21:02:58 2017 -0700 ---------------------------------------------------------------------- ansible/centos-7-erlang-18.2.yml | 21 ------- ansible/centos-7-erlang-18.3.yml | 21 +++++++ ansible/debian-8-erlang-18.2.yml | 22 ------- ansible/debian-8-erlang-18.3.yml | 24 +++++++ ansible/roles/erlang-18.2-centos/tasks/main.yml | 23 ------- ansible/roles/erlang-18.2-debian/tasks/main.yml | 66 -------------------- ansible/roles/erlang-18.3-centos/tasks/main.yml | 23 +++++++ .../erlang-esl-debian-omnibus/meta/main.yml | 2 + .../erlang-esl-debian-omnibus/vars/main.yml | 3 + .../roles/erlang-esl-debian-pkgs/meta/main.yml | 2 + .../roles/erlang-esl-debian-pkgs/vars/main.yml | 32 ++++++++++ ansible/roles/erlang-esl-debian/tasks/main.yml | 36 +++++++++++ ansible/roles/ubuntu-1604/vars/main.yml | 2 +- ansible/run-ansible-local.sh | 2 +- ansible/ubuntu-14.04-erlang-18.2.yml | 22 ------- ansible/ubuntu-14.04-erlang-18.3.yml | 24 +++++++ ansible/ubuntu-16.04-erlang-18.2.yml | 22 ------- ansible/ubuntu-16.04-erlang-18.3.yml | 24 +++++++ bin/centos-7-erlang-18.2/create-container.sh | 28 --------- bin/centos-7-erlang-18.2/enter-container.sh | 20 ------ bin/centos-7-erlang-18.2/publish-container.sh | 20 ------ .../run-build-in-container.sh | 24 ------- bin/centos-7-erlang-18.3/create-container.sh | 28 +++++++++ bin/centos-7-erlang-18.3/enter-container.sh | 20 ++++++ bin/centos-7-erlang-18.3/publish-container.sh | 20 ++++++ .../run-build-in-container.sh | 24 +++++++ bin/debian-8-erlang-18.2/create-container.sh | 28 --------- bin/debian-8-erlang-18.2/enter-container.sh | 20 ------ bin/debian-8-erlang-18.2/publish-container.sh | 20 ------ .../run-build-in-container.sh | 24 ------- bin/debian-8-erlang-18.3/create-container.sh | 28 +++++++++ bin/debian-8-erlang-18.3/enter-container.sh | 20 ++++++ bin/debian-8-erlang-18.3/publish-container.sh | 20 ++++++ .../run-build-in-container.sh | 24 +++++++ bin/rebuild-all.sh | 2 + .../create-container.sh | 28 --------- bin/ubuntu-14.04-erlang-18.2/enter-container.sh | 20 ------ .../publish-container.sh | 20 ------ .../run-build-in-container.sh | 24 ------- .../create-container.sh | 28 +++++++++ bin/ubuntu-14.04-erlang-18.3/enter-container.sh | 20 ++++++ .../publish-container.sh | 20 ++++++ .../run-build-in-container.sh | 24 +++++++ .../create-container.sh | 28 --------- bin/ubuntu-16.04-erlang-18.2/enter-container.sh | 20 ------ .../publish-container.sh | 20 ------ .../run-build-in-container.sh | 24 ------- .../create-container.sh | 28 +++++++++ bin/ubuntu-16.04-erlang-18.3/enter-container.sh | 20 ++++++ .../publish-container.sh | 20 ++++++ .../run-build-in-container.sh | 24 +++++++ dockerfiles/centos-7-erlang-18.2 | 34 ---------- dockerfiles/centos-7-erlang-18.3 | 34 ++++++++++ dockerfiles/debian-8-erlang-18.2 | 34 ---------- dockerfiles/debian-8-erlang-18.3 | 34 ++++++++++ dockerfiles/ubuntu-14.04-erlang-18.2 | 34 ---------- dockerfiles/ubuntu-14.04-erlang-18.3 | 34 ++++++++++ dockerfiles/ubuntu-16.04-erlang-18.2 | 34 ---------- dockerfiles/ubuntu-16.04-erlang-18.3 | 34 ++++++++++ jenkins/build.sh | 6 +- readme.markdown | 7 ++- 61 files changed, 706 insertions(+), 688 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/centos-7-erlang-18.2.yml ---------------------------------------------------------------------- diff --git a/ansible/centos-7-erlang-18.2.yml b/ansible/centos-7-erlang-18.2.yml deleted file mode 100644 index 23dfe42..0000000 --- a/ansible/centos-7-erlang-18.2.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -- hosts: couchdb-ci-worker - remote_user: root - roles: - - erlang-18.2-centos http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/centos-7-erlang-18.3.yml ---------------------------------------------------------------------- diff --git a/ansible/centos-7-erlang-18.3.yml b/ansible/centos-7-erlang-18.3.yml new file mode 100644 index 0000000..cffdc23 --- /dev/null +++ b/ansible/centos-7-erlang-18.3.yml @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- hosts: couchdb-ci-worker + remote_user: root + roles: + - erlang-18.3-centos http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/debian-8-erlang-18.2.yml ---------------------------------------------------------------------- diff --git a/ansible/debian-8-erlang-18.2.yml b/ansible/debian-8-erlang-18.2.yml deleted file mode 100644 index 04175c3..0000000 --- a/ansible/debian-8-erlang-18.2.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -- hosts: couchdb-ci-worker - remote_user: root - roles: - - debian-8 - - erlang-18.2-debian http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/debian-8-erlang-18.3.yml ---------------------------------------------------------------------- diff --git a/ansible/debian-8-erlang-18.3.yml b/ansible/debian-8-erlang-18.3.yml new file mode 100644 index 0000000..618464f --- /dev/null +++ b/ansible/debian-8-erlang-18.3.yml @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- hosts: couchdb-ci-worker + vars: + erlang_solutions_pkg_ver: "1:18.3-1" + remote_user: root + roles: + - debian-8 + - erlang-esl-debian-pkgs http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/erlang-18.2-centos/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-18.2-centos/tasks/main.yml b/ansible/roles/erlang-18.2-centos/tasks/main.yml deleted file mode 100644 index 242f5f2..0000000 --- a/ansible/roles/erlang-18.2-centos/tasks/main.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -- name: download and install Erlang 18.2 - yum: - name: "https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_18.2-1~centos~7_amd64.rpm"; - -- name: clean up yum cache - command: yum clean all http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/erlang-18.2-debian/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-18.2-debian/tasks/main.yml b/ansible/roles/erlang-18.2-debian/tasks/main.yml deleted file mode 100644 index fd74075..0000000 --- a/ansible/roles/erlang-18.2-debian/tasks/main.yml +++ /dev/null @@ -1,66 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -- name: import the Erlang Solutions key into apt - apt_key: - url: "{{ erlang_solutions_key_url }}" - state: present - # validate_certs: no - -- name: add Erlang Solutions deb repository - apt_repository: - repo: "{{ erlang_solutions_apt_repo_url }}" - state: present - -# apt-get update -- name: update apt cache - apt: - update_cache: yes - -- name: install Erlang 18.2 - apt: name={{item}} state=present install_recommends=no - with_items: - - erlang-dev=1:18.2 - - erlang-nox=1:18.2 - - erlang-base=1:18.2 - - erlang-asn1=1:18.2 - - erlang-corba=1:18.2 - - erlang-crypto=1:18.2 - - erlang-diameter=1:18.2 - - erlang-edoc=1:18.2 - - erlang-eldap=1:18.2 - - erlang-erl-docgen=1:18.2 - - erlang-eunit=1:18.2 - - erlang-ic=1:18.2 - - erlang-inets=1:18.2 - - erlang-inviso=1:18.2 - - erlang-mnesia=1:18.2 - - erlang-odbc=1:18.2 - - erlang-os-mon=1:18.2 - - erlang-parsetools=1:18.2 - - erlang-percept=1:18.2 - - erlang-public-key=1:18.2 - - erlang-runtime-tools=1:18.2 - - erlang-snmp=1:18.2 - - erlang-ssh=1:18.2 - - erlang-ssl=1:18.2 - - erlang-syntax-tools=1:18.2 - - erlang-tools=1:18.2 - - erlang-webtool=1:18.2 - - erlang-xmerl=1:18.2 - - erlang-eunit=1:18.2 - - erlang-dialyzer=1:18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/erlang-18.3-centos/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-18.3-centos/tasks/main.yml b/ansible/roles/erlang-18.3-centos/tasks/main.yml new file mode 100644 index 0000000..2bf0555 --- /dev/null +++ b/ansible/roles/erlang-18.3-centos/tasks/main.yml @@ -0,0 +1,23 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- name: download and install Erlang 18.3 + yum: + name: "http://packages.erlang-solutions.com/site/esl/esl-erlang/FLAVOUR_1_general/esl-erlang_18.3-1~centos~7_amd64.rpm"; + +- name: clean up yum cache + command: yum clean all http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/erlang-esl-debian-omnibus/meta/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-esl-debian-omnibus/meta/main.yml b/ansible/roles/erlang-esl-debian-omnibus/meta/main.yml new file mode 100644 index 0000000..9dd38b3 --- /dev/null +++ b/ansible/roles/erlang-esl-debian-omnibus/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - { role: erlang-esl-debian } http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/erlang-esl-debian-omnibus/vars/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-esl-debian-omnibus/vars/main.yml b/ansible/roles/erlang-esl-debian-omnibus/vars/main.yml new file mode 100644 index 0000000..fd5574a --- /dev/null +++ b/ansible/roles/erlang-esl-debian-omnibus/vars/main.yml @@ -0,0 +1,3 @@ +erlang_solutions_pkg_list: + - esl-erlang + http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/erlang-esl-debian-pkgs/meta/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-esl-debian-pkgs/meta/main.yml b/ansible/roles/erlang-esl-debian-pkgs/meta/main.yml new file mode 100644 index 0000000..9dd38b3 --- /dev/null +++ b/ansible/roles/erlang-esl-debian-pkgs/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - { role: erlang-esl-debian } http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml b/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml new file mode 100644 index 0000000..00ec403 --- /dev/null +++ b/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml @@ -0,0 +1,32 @@ +erlang_solutions_pkg_list: + - erlang-dev + - erlang-nox + - erlang-base + - erlang-asn1 + - erlang-corba + - erlang-crypto + - erlang-diameter + - erlang-edoc + - erlang-eldap + - erlang-erl-docgen + - erlang-eunit + - erlang-ic + - erlang-inets + - erlang-inviso + - erlang-mnesia + - erlang-odbc + - erlang-os-mon + - erlang-parsetools + - erlang-percept + - erlang-public-key + - erlang-runtime-tools + - erlang-snmp + - erlang-ssh + - erlang-ssl + - erlang-syntax-tools + - erlang-tools + - erlang-webtool + - erlang-xmerl + - erlang-eunit + - erlang-dialyzer + http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/erlang-esl-debian/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-esl-debian/tasks/main.yml b/ansible/roles/erlang-esl-debian/tasks/main.yml new file mode 100644 index 0000000..5e593a8 --- /dev/null +++ b/ansible/roles/erlang-esl-debian/tasks/main.yml @@ -0,0 +1,36 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- name: import the Erlang Solutions key into apt + apt_key: + url: "{{ erlang_solutions_key_url }}" + state: present + # validate_certs: no + +- name: add Erlang Solutions deb repository + apt_repository: + repo: "{{ erlang_solutions_apt_repo_url }}" + state: present + +# apt-get update +- name: update apt cache + apt: + update_cache: yes + +- name: install requested Erlang version + apt: name="{{item}}={{ erlang_solutions_pkg_ver }}" state=present install_recommends=no + with_items: "{{ erlang_solutions_pkg_list }}" http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/roles/ubuntu-1604/vars/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/ubuntu-1604/vars/main.yml b/ansible/roles/ubuntu-1604/vars/main.yml index 268c9d0..6fdd05e 100644 --- a/ansible/roles/ubuntu-1604/vars/main.yml +++ b/ansible/roles/ubuntu-1604/vars/main.yml @@ -1,2 +1,2 @@ erlang_solutions_key_url: http://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc -erlang_solutions_apt_repo_url: deb http://packages.erlang-solutions.com/ubuntu precise contrib +erlang_solutions_apt_repo_url: deb http://packages.erlang-solutions.com/ubuntu xenial contrib http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/run-ansible-local.sh ---------------------------------------------------------------------- diff --git a/ansible/run-ansible-local.sh b/ansible/run-ansible-local.sh index aae21e9..f9af1db 100755 --- a/ansible/run-ansible-local.sh +++ b/ansible/run-ansible-local.sh @@ -40,7 +40,7 @@ fi ANSIBLE_FORCE_COLOR=1 ANSIBLE_NOCOWS=1 \ ansible-playbook \ --connection=local \ - --inventory-file=./docker-inventories/ubuntu-14.04-erlang-18.2 \ + --inventory-file=./docker-inventories/ubuntu-14.04-erlang-18.3 \ --sudo \ $TAG \ site.yml http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/ubuntu-14.04-erlang-18.2.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-14.04-erlang-18.2.yml b/ansible/ubuntu-14.04-erlang-18.2.yml deleted file mode 100644 index d94bba0..0000000 --- a/ansible/ubuntu-14.04-erlang-18.2.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -- hosts: couchdb-ci-worker - remote_user: root - roles: - - ubuntu-1404 - - erlang-18.2-debian http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/ubuntu-14.04-erlang-18.3.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-14.04-erlang-18.3.yml b/ansible/ubuntu-14.04-erlang-18.3.yml new file mode 100644 index 0000000..56627a1 --- /dev/null +++ b/ansible/ubuntu-14.04-erlang-18.3.yml @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- hosts: couchdb-ci-worker + vars: + erlang_solutions_pkg_ver: "1:18.3" + remote_user: root + roles: + - ubuntu-1404 + - erlang-esl-debian-omnibus http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/ubuntu-16.04-erlang-18.2.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-16.04-erlang-18.2.yml b/ansible/ubuntu-16.04-erlang-18.2.yml deleted file mode 100644 index afa62cf..0000000 --- a/ansible/ubuntu-16.04-erlang-18.2.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -- hosts: couchdb-ci-worker - remote_user: root - roles: - - ubuntu-1604 - - erlang-18.2-debian http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/ansible/ubuntu-16.04-erlang-18.3.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-16.04-erlang-18.3.yml b/ansible/ubuntu-16.04-erlang-18.3.yml new file mode 100644 index 0000000..51331e0 --- /dev/null +++ b/ansible/ubuntu-16.04-erlang-18.3.yml @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- hosts: couchdb-ci-worker + vars: + erlang_solutions_pkg_ver: "1:18.3-1" + remote_user: root + roles: + - ubuntu-1604 + - erlang-esl-debian-pkgs http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/centos-7-erlang-18.2/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.2/create-container.sh b/bin/centos-7-erlang-18.2/create-container.sh deleted file mode 100755 index 349d711..0000000 --- a/bin/centos-7-erlang-18.2/create-container.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e - -# The Docker containers need the root directory of this repository as their -# build context (because they need the Ansible files). -pushd `dirname $0`/../.. > /dev/null - -docker build -f dockerfiles/centos-7-erlang-18.2 -t couchdbdev/centos-7-erlang-18.2 . - -popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/centos-7-erlang-18.2/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.2/enter-container.sh b/bin/centos-7-erlang-18.2/enter-container.sh deleted file mode 100755 index a6ac0c1..0000000 --- a/bin/centos-7-erlang-18.2/enter-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker run -it couchdbdev/centos-7-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/centos-7-erlang-18.2/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.2/publish-container.sh b/bin/centos-7-erlang-18.2/publish-container.sh deleted file mode 100755 index c1336a9..0000000 --- a/bin/centos-7-erlang-18.2/publish-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker push couchdbdev/centos-7-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/centos-7-erlang-18.2/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.2/run-build-in-container.sh b/bin/centos-7-erlang-18.2/run-build-in-container.sh deleted file mode 100755 index fe9aa90..0000000 --- a/bin/centos-7-erlang-18.2/run-build-in-container.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e -pushd $( dirname "$0" )/../.. -pwd -OS=centos-7 ERLANG=18.2 jenkins/build.sh -popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/centos-7-erlang-18.3/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.3/create-container.sh b/bin/centos-7-erlang-18.3/create-container.sh new file mode 100755 index 0000000..4933459 --- /dev/null +++ b/bin/centos-7-erlang-18.3/create-container.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +# The Docker containers need the root directory of this repository as their +# build context (because they need the Ansible files). +pushd `dirname $0`/../.. > /dev/null + +docker build -f dockerfiles/centos-7-erlang-18.3 -t couchdbdev/centos-7-erlang-18.3 . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/centos-7-erlang-18.3/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.3/enter-container.sh b/bin/centos-7-erlang-18.3/enter-container.sh new file mode 100755 index 0000000..c5ba583 --- /dev/null +++ b/bin/centos-7-erlang-18.3/enter-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker run -it couchdbdev/centos-7-erlang-18.3 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/centos-7-erlang-18.3/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.3/publish-container.sh b/bin/centos-7-erlang-18.3/publish-container.sh new file mode 100755 index 0000000..675df18 --- /dev/null +++ b/bin/centos-7-erlang-18.3/publish-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker push couchdbdev/centos-7-erlang-18.3 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/centos-7-erlang-18.3/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.3/run-build-in-container.sh b/bin/centos-7-erlang-18.3/run-build-in-container.sh new file mode 100755 index 0000000..3695ebc --- /dev/null +++ b/bin/centos-7-erlang-18.3/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=centos-7 ERLANG=18.3 jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/debian-8-erlang-18.2/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.2/create-container.sh b/bin/debian-8-erlang-18.2/create-container.sh deleted file mode 100755 index 095c99e..0000000 --- a/bin/debian-8-erlang-18.2/create-container.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e - -# The Docker containers need the root directory of this repository as their -# build context (because they need the Ansible files). -pushd `dirname $0`/../.. > /dev/null - -docker build -f dockerfiles/debian-8-erlang-18.2 -t couchdbdev/debian-8-erlang-18.2 . - -popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/debian-8-erlang-18.2/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.2/enter-container.sh b/bin/debian-8-erlang-18.2/enter-container.sh deleted file mode 100755 index f5b9a1a..0000000 --- a/bin/debian-8-erlang-18.2/enter-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker run -it couchdbdev/debian-8-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/debian-8-erlang-18.2/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.2/publish-container.sh b/bin/debian-8-erlang-18.2/publish-container.sh deleted file mode 100755 index fffc6c0..0000000 --- a/bin/debian-8-erlang-18.2/publish-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker push couchdbdev/debian-8-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/debian-8-erlang-18.2/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.2/run-build-in-container.sh b/bin/debian-8-erlang-18.2/run-build-in-container.sh deleted file mode 100755 index 151e811..0000000 --- a/bin/debian-8-erlang-18.2/run-build-in-container.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e -pushd $( dirname "$0" )/../.. -pwd -OS=debian-8 ERLANG=18.2 jenkins/build.sh -popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/debian-8-erlang-18.3/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.3/create-container.sh b/bin/debian-8-erlang-18.3/create-container.sh new file mode 100755 index 0000000..95511f1 --- /dev/null +++ b/bin/debian-8-erlang-18.3/create-container.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +# The Docker containers need the root directory of this repository as their +# build context (because they need the Ansible files). +pushd `dirname $0`/../.. > /dev/null + +docker build -f dockerfiles/debian-8-erlang-18.3 -t couchdbdev/debian-8-erlang-18.3 . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/debian-8-erlang-18.3/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.3/enter-container.sh b/bin/debian-8-erlang-18.3/enter-container.sh new file mode 100755 index 0000000..c259021 --- /dev/null +++ b/bin/debian-8-erlang-18.3/enter-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker run -it couchdbdev/debian-8-erlang-18.3 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/debian-8-erlang-18.3/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.3/publish-container.sh b/bin/debian-8-erlang-18.3/publish-container.sh new file mode 100755 index 0000000..ba9ddea --- /dev/null +++ b/bin/debian-8-erlang-18.3/publish-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker push couchdbdev/debian-8-erlang-18.3 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/debian-8-erlang-18.3/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.3/run-build-in-container.sh b/bin/debian-8-erlang-18.3/run-build-in-container.sh new file mode 100755 index 0000000..a939525 --- /dev/null +++ b/bin/debian-8-erlang-18.3/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=debian-8 ERLANG=18.3 jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/rebuild-all.sh ---------------------------------------------------------------------- diff --git a/bin/rebuild-all.sh b/bin/rebuild-all.sh index 78433b7..8207ab3 100755 --- a/bin/rebuild-all.sh +++ b/bin/rebuild-all.sh @@ -22,3 +22,5 @@ SCRIPTPATH=$(dirname "$SCRIPT") find $SCRIPTPATH/*-base -type d -exec {}/create-container.sh \; find $SCRIPTPATH/*erlang* -type d -exec {}/create-container.sh \; +exec $SCRIPTPATH/cleanup-docker.sh + http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-14.04-erlang-18.2/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.2/create-container.sh b/bin/ubuntu-14.04-erlang-18.2/create-container.sh deleted file mode 100755 index 4c4a7be..0000000 --- a/bin/ubuntu-14.04-erlang-18.2/create-container.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e - -# The Docker containers need the root directory of this repository as their -# build context (because they need the Ansible files). -pushd `dirname $0`/../.. > /dev/null - -docker build -f dockerfiles/ubuntu-14.04-erlang-18.2 -t couchdbdev/ubuntu-14.04-erlang-18.2 . - -popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-14.04-erlang-18.2/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.2/enter-container.sh b/bin/ubuntu-14.04-erlang-18.2/enter-container.sh deleted file mode 100755 index a755d9e..0000000 --- a/bin/ubuntu-14.04-erlang-18.2/enter-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker run -it couchdbdev/ubuntu-14.04-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-14.04-erlang-18.2/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.2/publish-container.sh b/bin/ubuntu-14.04-erlang-18.2/publish-container.sh deleted file mode 100755 index d3ca014..0000000 --- a/bin/ubuntu-14.04-erlang-18.2/publish-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker push couchdbdev/ubuntu-14.04-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-14.04-erlang-18.2/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.2/run-build-in-container.sh b/bin/ubuntu-14.04-erlang-18.2/run-build-in-container.sh deleted file mode 100755 index 8fe0eec..0000000 --- a/bin/ubuntu-14.04-erlang-18.2/run-build-in-container.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e -pushd $( dirname "$0" )/../.. -pwd -OS=ubuntu-14.04 ERLANG=18.2 jenkins/build.sh -popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-14.04-erlang-18.3/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.3/create-container.sh b/bin/ubuntu-14.04-erlang-18.3/create-container.sh new file mode 100755 index 0000000..6054b42 --- /dev/null +++ b/bin/ubuntu-14.04-erlang-18.3/create-container.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +# The Docker containers need the root directory of this repository as their +# build context (because they need the Ansible files). +pushd `dirname $0`/../.. > /dev/null + +docker build -f dockerfiles/ubuntu-14.04-erlang-18.3 -t couchdbdev/ubuntu-14.04-erlang-18.3 . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-14.04-erlang-18.3/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.3/enter-container.sh b/bin/ubuntu-14.04-erlang-18.3/enter-container.sh new file mode 100755 index 0000000..985051c --- /dev/null +++ b/bin/ubuntu-14.04-erlang-18.3/enter-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker run -it couchdbdev/ubuntu-14.04-erlang-18.3 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-14.04-erlang-18.3/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.3/publish-container.sh b/bin/ubuntu-14.04-erlang-18.3/publish-container.sh new file mode 100755 index 0000000..93fd590 --- /dev/null +++ b/bin/ubuntu-14.04-erlang-18.3/publish-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker push couchdbdev/ubuntu-14.04-erlang-18.3 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-14.04-erlang-18.3/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.3/run-build-in-container.sh b/bin/ubuntu-14.04-erlang-18.3/run-build-in-container.sh new file mode 100755 index 0000000..603d6fa --- /dev/null +++ b/bin/ubuntu-14.04-erlang-18.3/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=ubuntu-14.04 ERLANG=18.3 jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-16.04-erlang-18.2/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-16.04-erlang-18.2/create-container.sh b/bin/ubuntu-16.04-erlang-18.2/create-container.sh deleted file mode 100755 index d241493..0000000 --- a/bin/ubuntu-16.04-erlang-18.2/create-container.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e - -# The Docker containers need the root directory of this repository as their -# build context (because they need the Ansible files). -pushd `dirname $0`/../.. > /dev/null - -docker build -f dockerfiles/ubuntu-16.04-erlang-18.2 -t couchdbdev/ubuntu-16.04-erlang-18.2 . - -popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-16.04-erlang-18.2/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-16.04-erlang-18.2/enter-container.sh b/bin/ubuntu-16.04-erlang-18.2/enter-container.sh deleted file mode 100755 index de2d2a7..0000000 --- a/bin/ubuntu-16.04-erlang-18.2/enter-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker run -it couchdbdev/ubuntu-16.04-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-16.04-erlang-18.2/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-16.04-erlang-18.2/publish-container.sh b/bin/ubuntu-16.04-erlang-18.2/publish-container.sh deleted file mode 100755 index 72a36d3..0000000 --- a/bin/ubuntu-16.04-erlang-18.2/publish-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker push couchdbdev/ubuntu-16.04-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-16.04-erlang-18.2/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-16.04-erlang-18.2/run-build-in-container.sh b/bin/ubuntu-16.04-erlang-18.2/run-build-in-container.sh deleted file mode 100755 index c6875cc..0000000 --- a/bin/ubuntu-16.04-erlang-18.2/run-build-in-container.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e -pushd $( dirname "$0" )/../.. -pwd -OS=ubuntu-16.04 ERLANG=18.2 jenkins/build.sh -popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-16.04-erlang-18.3/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-16.04-erlang-18.3/create-container.sh b/bin/ubuntu-16.04-erlang-18.3/create-container.sh new file mode 100755 index 0000000..99dcc78 --- /dev/null +++ b/bin/ubuntu-16.04-erlang-18.3/create-container.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +# The Docker containers need the root directory of this repository as their +# build context (because they need the Ansible files). +pushd `dirname $0`/../.. > /dev/null + +docker build -f dockerfiles/ubuntu-16.04-erlang-18.3 -t couchdbdev/ubuntu-16.04-erlang-18.3 . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-16.04-erlang-18.3/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-16.04-erlang-18.3/enter-container.sh b/bin/ubuntu-16.04-erlang-18.3/enter-container.sh new file mode 100755 index 0000000..eb5e9a3 --- /dev/null +++ b/bin/ubuntu-16.04-erlang-18.3/enter-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker run -it couchdbdev/ubuntu-16.04-erlang-18.3 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-16.04-erlang-18.3/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-16.04-erlang-18.3/publish-container.sh b/bin/ubuntu-16.04-erlang-18.3/publish-container.sh new file mode 100755 index 0000000..1bec512 --- /dev/null +++ b/bin/ubuntu-16.04-erlang-18.3/publish-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker push couchdbdev/ubuntu-16.04-erlang-18.3 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/bin/ubuntu-16.04-erlang-18.3/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-16.04-erlang-18.3/run-build-in-container.sh b/bin/ubuntu-16.04-erlang-18.3/run-build-in-container.sh new file mode 100755 index 0000000..aa833df --- /dev/null +++ b/bin/ubuntu-16.04-erlang-18.3/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=ubuntu-16.04 ERLANG=18.3 jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/dockerfiles/centos-7-erlang-18.2 ---------------------------------------------------------------------- diff --git a/dockerfiles/centos-7-erlang-18.2 b/dockerfiles/centos-7-erlang-18.2 deleted file mode 100644 index 828ee41..0000000 --- a/dockerfiles/centos-7-erlang-18.2 +++ /dev/null @@ -1,34 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations - -# NOTE: All docker files need to be run from ../../, that is -# docker build -f /docker/<container>/Dockerfile - -FROM couchdbdev/centos-7-base:latest - -# Re-add ansible directory to pick up latest changes -# This avoids having to cascade rebuild all images when changing -# a role that only affects a child container -ADD ./ansible /ansible - -# Run Ansible to provision container with Erlang 18.2 -RUN ansible-playbook centos-7-erlang-18.2.yml \ - --connection=local \ - --inventory-file=./inventory/couchdb-ci-worker - -USER couchdb - -CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/dockerfiles/centos-7-erlang-18.3 ---------------------------------------------------------------------- diff --git a/dockerfiles/centos-7-erlang-18.3 b/dockerfiles/centos-7-erlang-18.3 new file mode 100644 index 0000000..e44ae50 --- /dev/null +++ b/dockerfiles/centos-7-erlang-18.3 @@ -0,0 +1,34 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations + +# NOTE: All docker files need to be run from ../../, that is +# docker build -f /docker/<container>/Dockerfile + +FROM couchdbdev/centos-7-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Erlang 18.3 +RUN ansible-playbook centos-7-erlang-18.3.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER couchdb + +CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/dockerfiles/debian-8-erlang-18.2 ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-8-erlang-18.2 b/dockerfiles/debian-8-erlang-18.2 deleted file mode 100644 index 15247e5..0000000 --- a/dockerfiles/debian-8-erlang-18.2 +++ /dev/null @@ -1,34 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations - -# NOTE: All docker files need to be run from ../../, that is -# docker build -f /docker/<container>/Dockerfile - -FROM couchdbdev/debian-8-base:latest - -# Re-add ansible directory to pick up latest changes -# This avoids having to cascade rebuild all images when changing -# a role that only affects a child container -ADD ./ansible /ansible - -# Run Ansible to provision container with Erlang 18.2 -RUN ansible-playbook debian-8-erlang-18.2.yml \ - --connection=local \ - --inventory-file=./inventory/couchdb-ci-worker - -USER couchdb - -CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/dockerfiles/debian-8-erlang-18.3 ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-8-erlang-18.3 b/dockerfiles/debian-8-erlang-18.3 new file mode 100644 index 0000000..e7f0b80 --- /dev/null +++ b/dockerfiles/debian-8-erlang-18.3 @@ -0,0 +1,34 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations + +# NOTE: All docker files need to be run from ../../, that is +# docker build -f /docker/<container>/Dockerfile + +FROM couchdbdev/debian-8-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Erlang 18.3 +RUN ansible-playbook debian-8-erlang-18.3.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER couchdb + +CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/dockerfiles/ubuntu-14.04-erlang-18.2 ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-14.04-erlang-18.2 b/dockerfiles/ubuntu-14.04-erlang-18.2 deleted file mode 100644 index 5206c8b..0000000 --- a/dockerfiles/ubuntu-14.04-erlang-18.2 +++ /dev/null @@ -1,34 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations - -# NOTE: All docker files need to be run from ../../, that is -# docker build -f /docker/<container>/Dockerfile - -FROM couchdbdev/ubuntu-14.04-base:latest - -# Re-add ansible directory to pick up latest changes -# This avoids having to cascade rebuild all images when changing -# a role that only affects a child container -ADD ./ansible /ansible - -# Run Ansible to provision container with Erlang 18.2 -RUN ansible-playbook ubuntu-14.04-erlang-18.2.yml \ - --connection=local \ - --inventory-file=./inventory/couchdb-ci-worker - -USER couchdb - -CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/dockerfiles/ubuntu-14.04-erlang-18.3 ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-14.04-erlang-18.3 b/dockerfiles/ubuntu-14.04-erlang-18.3 new file mode 100644 index 0000000..7ff2348 --- /dev/null +++ b/dockerfiles/ubuntu-14.04-erlang-18.3 @@ -0,0 +1,34 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations + +# NOTE: All docker files need to be run from ../../, that is +# docker build -f /docker/<container>/Dockerfile + +FROM couchdbdev/ubuntu-14.04-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Erlang 18.3 +RUN ansible-playbook ubuntu-14.04-erlang-18.3.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER couchdb + +CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/dockerfiles/ubuntu-16.04-erlang-18.2 ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-16.04-erlang-18.2 b/dockerfiles/ubuntu-16.04-erlang-18.2 deleted file mode 100644 index b13a373..0000000 --- a/dockerfiles/ubuntu-16.04-erlang-18.2 +++ /dev/null @@ -1,34 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations - -# NOTE: All docker files need to be run from ../../, that is -# docker build -f /docker/<container>/Dockerfile - -FROM couchdbdev/ubuntu-16.04-base:latest - -# Re-add ansible directory to pick up latest changes -# This avoids having to cascade rebuild all images when changing -# a role that only affects a child container -ADD ./ansible /ansible - -# Run Ansible to provision container with Erlang 18.2 -RUN ansible-playbook ubuntu-16.04-erlang-18.2.yml \ - --connection=local \ - --inventory-file=./inventory/couchdb-ci-worker - -USER couchdb - -CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/dockerfiles/ubuntu-16.04-erlang-18.3 ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-16.04-erlang-18.3 b/dockerfiles/ubuntu-16.04-erlang-18.3 new file mode 100644 index 0000000..dbedf62 --- /dev/null +++ b/dockerfiles/ubuntu-16.04-erlang-18.3 @@ -0,0 +1,34 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations + +# NOTE: All docker files need to be run from ../../, that is +# docker build -f /docker/<container>/Dockerfile + +FROM couchdbdev/ubuntu-16.04-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Erlang 18.3 +RUN ansible-playbook ubuntu-16.04-erlang-18.3.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER couchdb + +CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/jenkins/build.sh ---------------------------------------------------------------------- diff --git a/jenkins/build.sh b/jenkins/build.sh index 623b6b3..b65c258 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -62,9 +62,9 @@ case $ERLANG in echo "Using OS default Erlang" DOCKER_IMAGE=$DOCKER_IMAGE"erlang-default" ;; - 18.2*) - echo "Using Erlang 18.2" - DOCKER_IMAGE=$DOCKER_IMAGE"erlang-18.2" + 18.3*) + echo "Using Erlang 18.3" + DOCKER_IMAGE=$DOCKER_IMAGE"erlang-18.3" ;; *) echo "Unknown Erlang version $ERLANG" http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/399a8e08/readme.markdown ---------------------------------------------------------------------- diff --git a/readme.markdown b/readme.markdown index 61b7e92..075c7a5 100644 --- a/readme.markdown +++ b/readme.markdown @@ -13,13 +13,14 @@ for the origins of this work. ## Supported Configurations (updated 2017-03-22) -**OS/Erlang** | **default ** | **18.2** ---------------------|--------------|---------- +**OS/Erlang** | **default ** | **18.3** +--------------------|--------------|-------------- +**Ubuntu 12.04** | - | - **Ubuntu 14.04** | â (16B03-1) | â **Ubuntu 16.04** | â (18.3) | â **Debian 7** | - | - **Debian 8** | â (17.3) | â -**Debian 9** | - | - +**Debian 9** | unreleased | unreleased **CentOS 6** | - | - **CentOS 7** | â (16B03-1) | â **macOS 10.12** | - | -
