Move to go 1.21 (#456)

openconfig · Oct 31, 2023 · 1abf64c · 1abf64c
1 parent 86e7cc0
commit 1abf64c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 199 deletions.
diff --git a/cloudbuild/external.pkr.hcl b/cloudbuild/external.pkr.hcl
@@ -52,9 +52,9 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing golang...",
-      "curl -O https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz",
-      "sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz",
-      "rm go1.20.1.linux-amd64.tar.gz",
+      "curl -O https://dl.google.com/go/go1.21.3.linux-amd64.tar.gz",
+      "sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.21.3.linux-amd64.tar.gz",
+      "rm go1.21.3.linux-amd64.tar.gz",
       "echo 'export PATH=$PATH:/usr/local/go/bin' >> ~/.bashrc",
       "echo 'export PATH=$PATH:$(go env GOPATH)/bin' >> ~/.bashrc",
       "/usr/local/go/bin/go version",

diff --git a/cloudbuild/internal.pkr.hcl b/cloudbuild/internal.pkr.hcl
@@ -52,9 +52,9 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing golang...",
-      "curl -O https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz",
-      "sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz",
-      "rm go1.20.1.linux-amd64.tar.gz",
+      "curl -O https://dl.google.com/go/go1.21.3.linux-amd64.tar.gz",
+      "sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.21.3.linux-amd64.tar.gz",
+      "rm go1.21.3.linux-amd64.tar.gz",
       "echo 'export PATH=$PATH:/usr/local/go/bin' >> ~/.bashrc",
       "echo 'export PATH=$PATH:$(go env GOPATH)/bin' >> ~/.bashrc",
       "/usr/local/go/bin/go version",

diff --git a/cloudbuild/internal_ubuntu.pkr.hcl b/cloudbuild/internal_ubuntu.pkr.hcl
diff --git a/cloudbuild/postsubmit.yaml b/cloudbuild/postsubmit.yaml
@@ -31,22 +31,6 @@ steps:
     ]
     waitFor: [packer_init_internal]
 
-  - id: packer_init_internal_ubuntu
-    name: "us-west1-docker.pkg.dev/gep-kne/packer/packer:1.9.1"
-    args: ["init", "cloudbuild/internal_ubuntu.pkr.hcl"]
-    waitFor: ["-"] # run the builds concurrently
-
-  - id: packer_build_internal_ubuntu
-    name: "us-west1-docker.pkg.dev/gep-kne/packer/packer:1.9.1"
-    args: ["build", "cloudbuild/internal_ubuntu.pkr.hcl"]
-    env: [
-      "PKR_VAR_build_id=$BUILD_ID",
-      "PKR_VAR_short_sha=$SHORT_SHA",
-      "PKR_VAR_branch_name=$BRANCH_NAME",
-      "PKR_VAR_zone=${_ZONE}",
-    ]
-    waitFor: [packer_init_internal_ubuntu]
-
 timeout: 3600s
 
 substitutions: