Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UnixPB: Debian Fixes + trailing space fix #1052

Merged
merged 2 commits into from
Dec 19, 2019
Merged

UnixPB: Debian Fixes + trailing space fix #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ae2059
UnixPB: Fixed incorrectly named modules
Dec 18, 2019
565bd9d
Unix: Add Deb8 IP config for ansible, fix trailing space
Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ansible/Vagrantfile.Debian8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ echo "--------------------------------------------------------------------------
echo "*** '$VAGRANT_MOUNT/playbooks/hosts' file for ansible-playbook contains ***"
cat $VAGRANT_MOUNT/playbooks/hosts
echo "---------------------------------------------------------------------------------------"
# Get IPs of the VM, and output to shared folder
ifconfig | grep "inet" | awk '{print $2}' | sed 's/addr://' >> /vagrant/playbooks/AdoptOpenJDK_Unix_Playbook/hosts.tmp
# Put the host machine's IP into the authorised_keys file on the VM
[ -r /vagrant/id_rsa.pub ] && mkdir -p $HOME/.ssh && cat /vagrant/id_rsa.pub >> $HOME/.ssh/authorized_keys
SCRIPT

# 2 = version of configuration file for Vagrant 1.1+ leading up to 2.0.x
Expand Down
2 changes: 1 addition & 1 deletion ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
###################################
# AdoptOpenJDK - Ansible Playbook #
###################################
# Groups can be passed in as a command-line variable in Ansible playbook.
# Groups can be passed in as a command-line variable in Ansible playbook.
# It can be defined as 'all' or a specific group which the host belongs to.
# For example, it can be 'all' or 'x86' for when a host is in the group 'x86'.
- hosts: "{{ Groups | default('localhost:build:test:!*zos*:!*win*:!*aix*') }}"
Expand Down
1 change: 1 addition & 0 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Ant-Contrib/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
mode: 0440
timeout: 25
validate_certs: no
checksum: sha256:c9b8b1ca18b13e293688cafbd8990c940ca49104dbeefc242e5c3f8de271abdf
retries: 3
delay: 5
register: antContrib_download
Expand Down
4 changes: 2 additions & 2 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# Both repositories needed for gcc/g++-4.8
- name: Add additional repositories for Raspbian Buster
apt-repository: repo={{ item }}
apt_repository: repo={{ item }}
with_items:
- deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
- deb http://mirrordirector.raspbian.org/raspbian/ jessie main contrib non-free rpi
Expand Down Expand Up @@ -89,7 +89,7 @@
tags: build_tools

- name: Install GCC G++ on Raspian Buster
packages: "name={{ item }} state=latest"
package: "name={{ item }} state=latest"
with_items:
- gcc-4.8
- g++-4.8
Expand Down