From b8efa93e397a0c78a6149b6da017cf29ecf04810 Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Tue, 11 Jun 2019 16:49:26 +0200 Subject: [PATCH] PHRAS-2565 Update vars for PHP7-2 build, check of another builds in progress --- resources/ansible/roles/elasticsearch/tasks/main.yml | 2 +- resources/ansible/roles/repositories/tasks/main.yml | 2 +- resources/ansible/vars/all.yml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/ansible/roles/elasticsearch/tasks/main.yml b/resources/ansible/roles/elasticsearch/tasks/main.yml index d246953df7..655567c119 100644 --- a/resources/ansible/roles/elasticsearch/tasks/main.yml +++ b/resources/ansible/roles/elasticsearch/tasks/main.yml @@ -13,7 +13,7 @@ changed_when: false - name: Install Dependencies - apt: pkg=openjdk-7-jre state=latest + apt: pkg=openjdk-8-jre state=latest - name: Remove temporary debian package shell: rm -f /tmp/elasticsearch-{{ elasticsearch.version }}.deb diff --git a/resources/ansible/roles/repositories/tasks/main.yml b/resources/ansible/roles/repositories/tasks/main.yml index 2c00cef1e7..ee459d8949 100644 --- a/resources/ansible/roles/repositories/tasks/main.yml +++ b/resources/ansible/roles/repositories/tasks/main.yml @@ -16,7 +16,7 @@ - name: Add Key for MariaDB Repository sudo: yes - apt_key: url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xcbcb082a1bb943db + apt_key: url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xF1656F24C74CD1D8 # RabbitMQ - name: Add rabbitmq package repository diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index 5cdf9f6a51..acef9788e3 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -34,12 +34,14 @@ server: - fr_FR.UTF-8 - de_DE.UTF-8 - nl_NL.UTF-8 + repositories: php: 'ppa:ondrej/php' - mariadb: 'deb http://mirror6.layerjet.com/mariadb/repo/10.1/ubuntu' + mariadb: 'deb [arch=amd64,arm64,i386,ppc64el] http://mirror.nodesdirect.com/mariadb/repo/10.3/ubuntu' elasticsearch: 'ppa:webupd8team/java' rabbitmq: 'deb http://www.rabbitmq.com/debian/ testing main' yarn: 'https://dl.yarnpkg.com/debian/' + vagrant_local: install: '1' vm: