From 59201d5e66f195e48f822ff42e5846df5ed1f886 Mon Sep 17 00:00:00 2001 From: skudasov Date: Wed, 21 Aug 2024 19:05:13 +0200 Subject: [PATCH] fix lint --- .github/workflows/wasp-lint.yml | 2 +- .github/workflows/wasp-test-e2e.yml | 2 +- .github/workflows/wasp-test.yml | 4 ++-- wasp/build_test.sh | 5 ---- wasp/build_test_image.sh | 37 ----------------------------- wasp/cluster.go | 2 +- 6 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 wasp/build_test.sh delete mode 100755 wasp/build_test_image.sh diff --git a/.github/workflows/wasp-lint.yml b/.github/workflows/wasp-lint.yml index e920ccc53..cffdc2412 100644 --- a/.github/workflows/wasp-lint.yml +++ b/.github/workflows/wasp-lint.yml @@ -1,4 +1,4 @@ -name: WASP Lint [Tools] +name: WASP Lint on: push: permissions: diff --git a/.github/workflows/wasp-test-e2e.yml b/.github/workflows/wasp-test-e2e.yml index dab2716bf..471ccc898 100644 --- a/.github/workflows/wasp-test-e2e.yml +++ b/.github/workflows/wasp-test-e2e.yml @@ -1,4 +1,4 @@ -name: WASP E2E tests [Tools] +name: WASP E2E tests on: [push] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/wasp-test.yml b/.github/workflows/wasp-test.yml index 08ef82393..e2f99a6cb 100644 --- a/.github/workflows/wasp-test.yml +++ b/.github/workflows/wasp-test.yml @@ -1,4 +1,4 @@ -name: WASP Go Tests [Tools] +name: WASP Go Tests on: [push] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -23,4 +23,4 @@ jobs: - name: Run tests if: steps.changes.outputs.src == 'true' run: |- - nix develop -c make test_race \ No newline at end of file + nix develop -c make test_race diff --git a/wasp/build_test.sh b/wasp/build_test.sh deleted file mode 100644 index 197c87849..000000000 --- a/wasp/build_test.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -docker build -f load_test.Dockerfile --build-arg BUILD_ROOT=$1 --platform linux/amd64 -t $2 . -docker tag wasp-mercury-test $1/wasp-mercury-test:$4 -aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin $1 -docker push $1/wasp-mercury-test:$4 diff --git a/wasp/build_test_image.sh b/wasp/build_test_image.sh deleted file mode 100755 index d53cb8cc1..000000000 --- a/wasp/build_test_image.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -o pipefail -set +e - -# Check if required parameters are provided -if [ "$#" -ne 6 ]; then - echo "Usage: $0 DOCKERFILE_PATH TESTS_ROOT_PATH IMAGE_TAG ECR_REGISTRY_NAME ECR_REGISTRY_REPO_NAME DOCKER_CMD_EXEC_PATH" - exit 1 -fi - -DOCKERFILE_PATH="$1" -TESTS_ROOT_PATH="$2" -IMAGE_TAG="$3" -ECR_REGISTRY_NAME="$4" -ECR_REGISTRY_REPO_NAME="$5" -DOCKER_CMD_EXEC_PATH="$6" - -# Build Docker image -cd "$DOCKER_CMD_EXEC_PATH" && docker build --platform linux/amd64 -t "$IMAGE_TAG" -f "$DOCKERFILE_PATH" --build-arg TESTS_ROOT="$TESTS_ROOT_PATH" . - -# Authenticate Docker with ECR -aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin "$ECR_REGISTRY_NAME" - -# Tag the Docker image with ECR registry name -docker tag "$IMAGE_TAG" "$ECR_REGISTRY_NAME/$ECR_REGISTRY_REPO_NAME:$IMAGE_TAG" - -# Push Docker image to ECR -docker push "$ECR_REGISTRY_NAME/$ECR_REGISTRY_REPO_NAME:$IMAGE_TAG" - -# Verify push success -if [ $? -eq 0 ]; then - echo "Image successfully pushed to ECR." -else - echo "Failed to push image to ECR." - exit 1 -fi diff --git a/wasp/cluster.go b/wasp/cluster.go index 3e5c24e7b..29ac50d20 100644 --- a/wasp/cluster.go +++ b/wasp/cluster.go @@ -40,7 +40,7 @@ var DefaultDockerfile []byte //go:embed DockerfileWasp.dockerignore var DefaultDockerIgnorefile []byte -//go:embed build_test_image.sh +// TODO: remove the whole stuff in favor of remote-runner var DefaultBuildScript []byte var (