-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: cleanup appveyor definitions for not running jobs which is already run with GHA & add docker info/version commands #5306
Changes from 2 commits
d4837f7
6bc6e2b
3531bbb
0bb8e97
fe1d527
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,7 +61,8 @@ install: | |
|
||
- sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate" | ||
- sh: "rvm use 2.7.2" | ||
- sh: "docker --version" | ||
- sh: "docker info" | ||
- sh: "docker version" | ||
- sh: "nvm install ${NODE_VERSION}" | ||
- sh: "npm install [email protected] -g" | ||
- sh: "npm -v" | ||
|
@@ -149,7 +150,8 @@ install: | |
|
||
|
||
build_script: | ||
- "python -c \"import sys; print(sys.executable)\"" | ||
- "python -c \"import sys; print(sys.executable)\"" | ||
- "make init" | ||
|
||
# Final clean up no matter success or failure | ||
on_finish: | ||
|
@@ -176,10 +178,6 @@ for: | |
- configuration: BuildIntegTesting | ||
|
||
test_script: | ||
# Pre-dev Tests | ||
- "pip install -e \".[pre-dev]\"" | ||
|
||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv tests/integration/buildcmd --ignore=tests/integration/buildcmd/test_build_terraform_applications.py --ignore=tests/integration/buildcmd/test_build_terraform_applications_other_cases.py --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# Set JAVA_HOME to java11 | ||
|
@@ -193,10 +191,6 @@ for: | |
- configuration: LocalZipTerraformBuildIntegTesting | ||
|
||
test_script: | ||
# Pre-dev Tests | ||
- "pip install -e \".[pre-dev]\"" | ||
|
||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv -n 4 tests/integration/buildcmd/test_build_terraform_applications.py::TestBuildTerraformApplicationsWithZipBasedLambdaFunctionAndLocalBackend_0 --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# Local ZIP Terraform Build In Container integ testing | ||
|
@@ -206,10 +200,6 @@ for: | |
- configuration: LocalZipTerraformBuildInContainerIntegTesting | ||
|
||
test_script: | ||
# Pre-dev Tests | ||
- "pip install -e \".[pre-dev]\"" | ||
|
||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv -n 4 tests/integration/buildcmd/test_build_terraform_applications.py::TestBuildTerraformApplicationsWithZipBasedLambdaFunctionAndLocalBackend_1 --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# S3 ZIP Terraform Build integ testing | ||
|
@@ -219,10 +209,6 @@ for: | |
- configuration: S3ZipTerraformBuildIntegTesting | ||
|
||
test_script: | ||
# Pre-dev Tests | ||
- "pip install -e \".[pre-dev]\"" | ||
|
||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv -n 4 tests/integration/buildcmd/test_build_terraform_applications.py::TestBuildTerraformApplicationsWithZipBasedLambdaFunctionAndS3Backend_0 --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# S3 ZIP Terraform Build In Container integ testing | ||
|
@@ -232,10 +218,6 @@ for: | |
- configuration: S3ZipTerraformBuildInContainerIntegTesting | ||
|
||
test_script: | ||
# Pre-dev Tests | ||
- "pip install -e \".[pre-dev]\"" | ||
|
||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv -n 4 tests/integration/buildcmd/test_build_terraform_applications.py::TestBuildTerraformApplicationsWithZipBasedLambdaFunctionAndS3Backend_1 --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# Other Terraform Build In Container integ testing | ||
|
@@ -245,10 +227,6 @@ for: | |
- configuration: OtherTerraformBuildIntegTesting | ||
|
||
test_script: | ||
# Pre-dev Tests | ||
- "pip install -e \".[pre-dev]\"" | ||
|
||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv -n 4 tests/integration/buildcmd/test_build_terraform_applications_other_cases.py --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# Integ testing deploy | ||
|
@@ -258,7 +236,6 @@ for: | |
- configuration: DeployIntegTesting | ||
|
||
test_script: | ||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv tests/integration/deploy -n 4 --reruns 4 --dist=loadgroup --json-report --json-report-file=TEST_REPORT-integration-deploy.json" | ||
|
||
# Integ testing package | ||
|
@@ -268,7 +245,6 @@ for: | |
- configuration: PackageIntegTesting | ||
|
||
test_script: | ||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv tests/integration/package -n 4 --reruns 4 --json-report --json-report-file=TEST_REPORT-integration-package.json" | ||
|
||
# Integ testing delete | ||
|
@@ -278,7 +254,6 @@ for: | |
- configuration: DeleteIntegTesting | ||
|
||
test_script: | ||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv tests/integration/delete -n 4 --reruns 4 --json-report --json-report-file=TEST_REPORT-integration-delete.json" | ||
|
||
# Integ testing sync | ||
|
@@ -288,7 +263,6 @@ for: | |
- configuration: SyncIntegTesting | ||
|
||
test_script: | ||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv tests/integration/sync -n 3 --reruns 3 --dist loadscope --json-report --json-report-file=TEST_REPORT-integration-sync.json" | ||
|
||
# Integ testing local | ||
|
@@ -298,11 +272,6 @@ for: | |
- configuration: LocalIntegTesting | ||
|
||
test_script: | ||
# Pre-dev Tests | ||
- "pip install -e \".[pre-dev]\"" | ||
- "ruff samcli" | ||
|
||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-local.json" | ||
|
||
# End-to-end testing | ||
|
@@ -312,7 +281,6 @@ for: | |
- configuration: EndToEndTesting | ||
|
||
test_script: | ||
- "pip install -e \".[dev]\"" | ||
- sh: "pytest -vv -n 4 --reruns 5 --dist loadscope tests/end_to_end --json-report --json-report-file=TEST_REPORT-end-to-end.json" | ||
|
||
# Other testing | ||
|
@@ -322,18 +290,5 @@ for: | |
- configuration: OtherTesting | ||
|
||
test_script: | ||
# Pre-dev Tests | ||
- "pip install -e \".[pre-dev]\"" | ||
- "ruff samcli" | ||
|
||
# Dev Tests | ||
- "pip install -e \".[dev]\"" | ||
- "pytest --cov samcli --cov-report term-missing --cov-fail-under 94 tests/unit --json-report --json-report-file=TEST_REPORT-unit.json" | ||
- "ruff samcli" | ||
- "mypy setup.py samcli tests" | ||
- "pytest -n 4 tests/functional --json-report --json-report-file=TEST_REPORT-functional.json" | ||
|
||
- sh: "pytest -vv -n 4 --reruns 4 --dist loadgroup tests/integration --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json" | ||
- sh: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json" | ||
- sh: "black --check setup.py tests samcli" | ||
- sh: "pytest -n 4 -vv tests/smoke --json-report --json-report-file=TEST_REPORT-smoke.json" |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,6 +74,7 @@ install: | |
- "echo %PATH%" | ||
- "python --version" | ||
- "docker info" | ||
- "docker version" | ||
|
||
# install Terraform CLI | ||
- "choco install terraform" | ||
|
@@ -135,6 +136,10 @@ install: | |
|
||
- "IF DEFINED BY_CANARY ECHO Logging in Public ECR && aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws" | ||
|
||
build_script: | ||
- "docker system prune -a -f" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it a Windows specific step? Why do we need to prune on Windows? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is probably run to get some disk space back, let me add a comment there There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need to do the same for Ubuntu then? |
||
- "venv\\Scripts\\activate" | ||
|
||
# Final clean up no matter success or failure | ||
on_finish: | ||
# Upload test reports as artifacts | ||
|
@@ -181,10 +186,6 @@ for: | |
- cargo lambda -V | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv tests/integration/buildcmd --ignore tests/integration/buildcmd/test_build_terraform_applications.py --ignore=tests/integration/buildcmd/test_build_terraform_applications_other_cases.py --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# Local ZIP Terraform Build integ testing | ||
|
@@ -193,10 +194,6 @@ for: | |
- configuration: LocalZipTerraformBuildIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv -n 4 tests/integration/buildcmd/test_build_terraform_applications.py::TestBuildTerraformApplicationsWithZipBasedLambdaFunctionAndLocalBackend_0 --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# Local ZIP Terraform Build In Container integ testing | ||
|
@@ -205,10 +202,6 @@ for: | |
- configuration: LocalZipTerraformBuildInContainerIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv tests/integration/buildcmd/test_build_terraform_applications.py::TestBuildTerraformApplicationsWithZipBasedLambdaFunctionAndLocalBackend_1 --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# S3 ZIP Terraform Build integ testing | ||
|
@@ -217,10 +210,6 @@ for: | |
- configuration: S3ZipTerraformBuildIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv -n 4 tests/integration/buildcmd/test_build_terraform_applications.py::TestBuildTerraformApplicationsWithZipBasedLambdaFunctionAndS3Backend_0 --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# S3 ZIP Terraform Build In Container integ testing | ||
|
@@ -229,10 +218,6 @@ for: | |
- configuration: S3ZipTerraformBuildInContainerIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv tests/integration/buildcmd/test_build_terraform_applications.py::TestBuildTerraformApplicationsWithZipBasedLambdaFunctionAndS3Backend_1 --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
# Other Terraform Build integ testing | ||
|
@@ -241,10 +226,6 @@ for: | |
- configuration: OtherTerraformBuildIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv -n 4 tests/integration/buildcmd/test_build_terraform_applications_other_cases.py --json-report --json-report-file=TEST_REPORT-integration-buildcmd.json" | ||
|
||
#Integ testing deploy | ||
|
@@ -253,10 +234,6 @@ for: | |
- configuration: DeployIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv tests/integration/deploy -n 4 --reruns 4 --dist=loadgroup --json-report --json-report-file=TEST_REPORT-integration-deploy.json" | ||
|
||
# Integ testing package | ||
|
@@ -265,10 +242,6 @@ for: | |
- configuration: PackageIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv tests/integration/package -n 4 --reruns 4 --json-report --json-report-file=TEST_REPORT-integration-package.json" | ||
|
||
# Integ testing delete | ||
|
@@ -277,10 +250,6 @@ for: | |
- configuration: DeleteIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv tests/integration/delete -n 4 --reruns 4 --json-report --json-report-file=TEST_REPORT-integration-delete.json" | ||
|
||
# Integ testing sync | ||
|
@@ -289,10 +258,6 @@ for: | |
- configuration: SyncIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv tests/integration/sync -n 3 --reruns 3 --dist loadscope --json-report --json-report-file=TEST_REPORT-integration-sync.json" | ||
|
||
#Integ testing local | ||
|
@@ -301,10 +266,6 @@ for: | |
- configuration: LocalIntegTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-local.json" | ||
|
||
# End-to-end testing | ||
|
@@ -313,10 +274,6 @@ for: | |
- configuration: EndToEndTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest -vv -n 4 --reruns 5 --dist loadscope tests/end_to_end --json-report --json-report-file=TEST_REPORT-end-to-end.json" | ||
|
||
#Other testing | ||
|
@@ -325,13 +282,6 @@ for: | |
- configuration: OtherTesting | ||
|
||
test_script: | ||
# Reactivate virtualenv before running tests | ||
- "git --version" | ||
- "venv\\Scripts\\activate" | ||
- "docker system prune -a -f" | ||
- ps: "pytest --cov samcli --cov-report term-missing --cov-fail-under 94 tests/unit --json-report --json-report-file=TEST_REPORT-unit.json" | ||
- "mypy setup.py samcli tests" | ||
- ps: "pytest -n 4 tests/functional --json-report --json-report-file=TEST_REPORT-functional.json" | ||
- ps: "pytest -vv -n 4 --reruns 4 --dist loadgroup tests/integration --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json" | ||
- ps: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json" | ||
# Uncomment for RDP | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need this or we need to move
ruff
into therequirements/dev.txt
. I don't know why we have a "pre-dev" file.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I understand that
pre-dev.txt
is imported at the top of thedev.txt
https://github.com/aws/aws-sam-cli/blob/develop/requirements/dev.txt#L1There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well would you look at that... lol