From: Eric Ball Date: Thu, 27 Feb 2020 16:23:22 +0000 (+0000) Subject: Merge "Add Go to path in /etc/environment" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9e938e11b971878c7aa18b9c342e8b79c317ed45;hp=b02727c20ce34a98610002bec35c0dc418d89c39;p=ci-management.git Merge "Add Go to path in /etc/environment" --- diff --git a/packer/common-packer b/packer/common-packer index 1d5bbea3..da5d5cf9 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 1d5bbea3f4a9c037228a923e47dd76f70aeae2a9 +Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100 diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index fb158e87..609bbf39 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -7,6 +7,10 @@ become_user: root become_method: sudo + vars: + golang_version: 1.12 + gopath: '/opt/go/{{golang_version}}/bin' + pre_tasks: - include_role: name=lfit.system-update @@ -27,5 +31,13 @@ - include_role: name: gantsign.golang vars: - golang_version: 1.12 ansible_become: true + + - name: Add Go to Ubuntu path + lineinfile: + path: /etc/environment + regexp: 'PATH=(["]*)((?!.*?{{gopath}}).*?)(["]*)$' + line: 'PATH=\1\2:{{gopath}}\3' + backrefs: yes + when: ansible_distribution == 'Ubuntu' + become: yes