From 0018b7e5a83e5f5434820a97b64fdff26525d51b Mon Sep 17 00:00:00 2001
From: Ashesh Vidyut <134911583+absolutelightning@users.noreply.github.com>
Date: Mon, 18 Sep 2023 10:45:22 +0530
Subject: [PATCH] Fixes for integration tests windows for ENT (#18839)

* fixes for integration tests

* fix runner size for enterprise

* fix spacing

* fix spacing

* removed branch test run
---
 .github/scripts/get_runner_classes_windows.sh   | 8 ++++----
 .github/workflows/test-integrations-windows.yml | 5 +++++
 build-support/windows/build-consul-dev-image.sh | 9 ---------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/scripts/get_runner_classes_windows.sh b/.github/scripts/get_runner_classes_windows.sh
index 47b1d15b0d..ae75625974 100755
--- a/.github/scripts/get_runner_classes_windows.sh
+++ b/.github/scripts/get_runner_classes_windows.sh
@@ -10,11 +10,11 @@ set -euo pipefail
 case "$GITHUB_REPOSITORY" in
 *-enterprise)
 	# shellcheck disable=SC2129
-	echo "compute-small=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.4xlarge']" >>"$GITHUB_OUTPUT"
-	echo "compute-medium=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.8xlarge']" >>"$GITHUB_OUTPUT"
-	echo "compute-large=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.12xlarge']" >>"$GITHUB_OUTPUT"
+	echo "compute-small=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.2xlarge']" >>"$GITHUB_OUTPUT"
+	echo "compute-medium=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.4xlarge']" >>"$GITHUB_OUTPUT"
+	echo "compute-large=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.8xlarge']" >>"$GITHUB_OUTPUT"
 	# m5d.8xlarge is equivalent to our xl custom runner in CE
-	echo "compute-xl=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.16xlarge']" >>"$GITHUB_OUTPUT"
+	echo "compute-xl=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.12xlarge']" >>"$GITHUB_OUTPUT"
 	;;
 *)
 	# shellcheck disable=SC2129
diff --git a/.github/workflows/test-integrations-windows.yml b/.github/workflows/test-integrations-windows.yml
index 406fcb796b..59889befe6 100644
--- a/.github/workflows/test-integrations-windows.yml
+++ b/.github/workflows/test-integrations-windows.yml
@@ -76,6 +76,11 @@ jobs:
           name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}'
           path: ${{ github.workspace }}
 
+      - name: Create dist folder and copy binary
+        run: |
+          mkdir dist
+          cp ${{ github.workspace }}\consul.exe dist\
+
       - name: Restore mode+x
         run: icacls ${{ github.workspace }}\consul.exe /grant:rx Everyone:RX
 
diff --git a/build-support/windows/build-consul-dev-image.sh b/build-support/windows/build-consul-dev-image.sh
index ddc5e521d1..198a5c52fc 100644
--- a/build-support/windows/build-consul-dev-image.sh
+++ b/build-support/windows/build-consul-dev-image.sh
@@ -4,14 +4,5 @@
 
 
 cd ../../
-rm -rf dist
-
-export GOOS=windows GOARCH=amd64
 VERSION=1.16.0
-CONSUL_BUILDDATE=$(date +"%Y-%m-%dT%H:%M:%SZ")
-GIT_IMPORT=github.com/hashicorp/consul/version
-GOLDFLAGS=" -X $GIT_IMPORT.Version=$VERSION -X $GIT_IMPORT.VersionPrerelease=dev -X $GIT_IMPORT.BuildDate=$CONSUL_BUILDDATE "
-
-go build -ldflags "$GOLDFLAGS" -o ./dist/ .
-
 docker build -t windows/consul:${VERSION}-dev -f build-support/windows/Dockerfile-consul-dev-windows . --build-arg VERSION=${VERSION}