status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ashesh Vidyut 2023-09-18 10:45:22 +05:30 committed by GitHub
parent 5d99fb7bdf
commit 0018b7e5a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/scripts/get_runner_classes_windows.sh vendored
View File

@ -10,11 +10,11 @@ set -euo pipefail
case "$GITHUB_REPOSITORY" in case "$GITHUB_REPOSITORY" in
*-enterprise) *-enterprise)
# shellcheck disable=SC2129 # shellcheck disable=SC2129
echo "compute-small=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.4xlarge']" >>"$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.8xlarge']" >>"$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.12xlarge']" >>"$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 # 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 # shellcheck disable=SC2129

5
.github/workflows/test-integrations-windows.yml vendored
View File

@ -76,6 +76,11 @@ jobs:
name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}' name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}'
path: ${{ github.workspace }} path: ${{ github.workspace }}
- name: Create dist folder and copy binary
run: |
mkdir dist
cp ${{ github.workspace }}\consul.exe dist\
- name: Restore mode+x - name: Restore mode+x
run: icacls ${{ github.workspace }}\consul.exe /grant:rx Everyone:RX run: icacls ${{ github.workspace }}\consul.exe /grant:rx Everyone:RX

9
build-support/windows/build-consul-dev-image.sh
View File

@ -4,14 +4,5 @@
cd ../../ cd ../../
rm -rf dist
export GOOS=windows GOARCH=amd64
VERSION=1.16.0 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} docker build -t windows/consul:${VERSION}-dev -f build-support/windows/Dockerfile-consul-dev-windows . --build-arg VERSION=${VERSION}