Merge "CI: Upgrade global-jjb to the latest v0.80.2"

diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index 1b41e92..74c9f96 100644 (file)
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -15,7 +15,7 @@
 
     platforms:
       - centos-7
-      - centos-8
+      - centos-cs-8
       - ubuntu-18.04
       - ubuntu-20.04
     templates: builder
@@ -37,7 +37,7 @@
 
     platforms:
       - centos-7
-      - centos-8
+      - centos-cs-8
       - ubuntu-18.04-arm64
       - ubuntu-18.04
       - ubuntu-20.04
@@ -80,7 +80,7 @@
 
     platforms:
       - centos-7
-      - centos-8
+      - centos-cs-8
     templates: redis
     update-cloud-image: true
 

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index c0c0233..6e3aad8 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -209,14 +209,17 @@
     - name: npm self-update
       command: npm install npm@{{ npm_version }} -g
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: npm install n module
       command: npm install n -g
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Upgrade latest stable node version
       command: n stable | PATH="$PATH"
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Add Google Chrome key
       apt_key: