From dcb6a005bc0ca19bc47f4a02be1b2a40d692ef47 Mon Sep 17 00:00:00 2001
From: Mircea Cosbuc <mircea.cosbuc@mongodb.com>
Date: Wed, 1 May 2024 12:14:49 +0200
Subject: [PATCH] Fix evg for cli release

---
 .evergreen.yml | 36 ++++++++++++++++++++----------------
 .gitignore     |  3 ++-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 31c022d..4f10463 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -4,7 +4,6 @@ variables:
     GO111MODULE: "on"
     GOROOT: "/opt/golang/go1.21"
 functions:
-
   "clone":
     - command: subprocess.exec
       type: setup
@@ -23,7 +22,7 @@ functions:
       params:
         script: |
           set -Eeu pipefail
-          
+
           curl -fL "${goreleaser_pro_tar_gz}" --output goreleaser_Linux_x86_64.tar.gz
           tar -xf goreleaser_Linux_x86_64.tar.gz
           chmod 755 ./goreleaser
@@ -36,7 +35,7 @@ functions:
           - notary_service_url
         script: |
           set -Eeu pipefail
-          
+
           curl "${notary_service_url}" --output macos-notary.zip
           unzip -u macos-notary.zip
           chmod 755 ./linux_amd64/macnotary
@@ -47,6 +46,12 @@ functions:
         working_dir: src/github.com/mongodb/mongodb-enterprise-kubernetes/tools/multicluster
         include_expansions_in_env:
           - GITHUB_TOKEN
+          - GRS_USERNAME
+          - GRS_PASSWORD
+          - PKCS11_URI
+          - ARTIFACTORY_URL
+          - ARTIFACTORY_PASSWORD
+          - SIGNING_IMAGE_URI
           - macos_notary_keyid
           - macos_notary_secret
           - workdir
@@ -61,11 +66,11 @@ functions:
           set -Eeu pipefail
 
           export PATH=$GOROOT/bin:$PATH
-          ${workdir}/goreleaser release --rm-dist
+          ${workdir}/goreleaser release --rm-dist --skip=validate
 
 tasks:
   - name: package_goreleaser
-    git_tag_only: true
+    #git_tag_only: true
     tags: ["packaging"]
     commands:
       - func: "clone"
@@ -74,14 +79,13 @@ tasks:
       - func: "release"
 
 buildvariants:
-
-# This variant is kept manual for now in order avoid any interfering with the existing release process.
-# In the future, it will be called in one of two ways:
-# By PCT when a new operator version is released.
-# When a new tag is out similarly to github actions.
-- name: release_mcli
-  display_name: Release Go multi-cluster binary
-  run_on:
-    - ubuntu2204-small
-  tasks:
-    - name: package_goreleaser
+  # This variant is kept manual for now in order avoid any interfering with the existing release process.
+  # In the future, it will be called in one of two ways:
+  # By PCT when a new operator version is released.
+  # When a new tag is out similarly to github actions.
+  - name: release_mcli
+    display_name: Release Go multi-cluster binary
+    run_on:
+      - ubuntu2204-small
+    tasks:
+      - name: package_goreleaser
diff --git a/.gitignore b/.gitignore
index e37f9d8..0620958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea
 *.iml
 .DS_Store
-tools/multicluster/linux_amd64/*
\ No newline at end of file
+.evergreen.yml
+tools/multicluster/linux_amd64/*