summaryrefslogtreecommitdiffstats
path: root/packer
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2023-04-17 09:23:15 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2023-04-17 09:23:15 -0700
commit306347b64a6bd2237570eb2e3723cd15c8f7c7f4 (patch)
tree8860af3b61790241e442cafbcbb6cb9b46a6f7c0 /packer
parent3b131a6c50be534eeacfbae5d584d078ae86f3b2 (diff)
Fix: Use same Node/NPM install step for Ubuntu
Remove separate solution for node install for Ubuntu18.04 Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I86956efbd3e653725a71b39e5154d755ed358452
Diffstat (limited to 'packer')
-rw-r--r--packer/provision/local-docker.yaml32
1 files changed, 1 insertions, 31 deletions
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index ac1480370..16c99587f 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -10,7 +10,6 @@
glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c
glide_version: v0.13.1
golang_version: 1.9.1
- npm_version: "6.14.13"
tasks:
- name: "Checking for x86_64"
@@ -115,24 +114,6 @@
become: true
when: ansible_distribution == 'Ubuntu'
- - name: Install nodejs-dev libssl1.0-dev dep
- apt:
- name:
- - libssl1.0-dev
- update_cache: yes
- state: fixed
- become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
-
- - name: Install nodejs-dev dep for npm
- apt:
- name:
- - nodejs-dev
- update_cache: yes
- state: fixed
- become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
-
- name: Install supporting packages (Ubuntu 18.04)
apt:
name:
@@ -177,17 +158,6 @@
become: true
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
- - name: Install npm and addon packages
- apt:
- name:
- - nodejs
- - npm
- - node-gyp
- update_cache: yes
- state: fixed
- become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
-
- name: Install nodejs
block:
- name: install nodejs prerequisites
@@ -215,7 +185,7 @@
- nodejs
state: present
become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
+ when: ansible_distribution == 'Ubuntu'
- name: Check nodejs and npm versions
block: