fix(golang): ensure using on ubuntu

saltstack-formulas · Jan 16, 2020 · bd909bd · bd909bd
1 parent 0f992d9
commit bd909bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/test/integration/default/controls/archives_spec.rb b/test/integration/default/controls/archives_spec.rb
@@ -17,7 +17,4 @@
       it { should exist }
     end
   end
-  describe file('/usr/local/go/bin/go') do
-    it { should be_executable }
-  end
 end
diff --git a/test/salt/pillar/ubuntu.sls b/test/salt/pillar/ubuntu.sls
@@ -1,6 +1,13 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
+# Dependency (golang)
+golang:
+  pkg:
+    name: golang
+    use_upstream_repo: false
+    use_upstream_archive: false
+
 packages:
   pkgs:
     # A dict of "package: version" pairs:
@@ -89,12 +96,6 @@ packages:
           # yamllint disable-line rule:line-length
           source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml
           hashsum: 1751f8e4f6b4cddd8c4843a0f4473274
-      golang:
-        dest: /usr/local
-        dl:
-          format: tar
-          source: https://dl.google.com/go/go1.12.7.linux-amd64.tar.gz
-          hashsum: 66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9
     unwanted:
       - /usr/local/boring_archive_software