Skip to content
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

Revert #3544 (Bump requests from 2.28.1 to 2.31.0) and add a test on actual build images #3559

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dockerfile-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'docker/release/dockerfiles/**'

jobs:
test_ci:
dockerfile-lint-test_ci:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -17,7 +17,7 @@ jobs:
dockerfile: 'docker/ci/dockerfiles/current/*.dockerfile'
annotate: false

test_release:
dockerfile-lint-test_release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/groovy-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: groovy-tests
on: [push, pull_request]

jobs:
test:
groovy-tests:
runs-on: ubuntu-latest
steps:
- name: Setup Java
Expand Down
29 changes: 28 additions & 1 deletion .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: python-tests
on: [push, pull_request]

jobs:
test:
python-tests:
strategy:
matrix:
os:
Expand Down Expand Up @@ -40,3 +40,30 @@ jobs:
uses: codecov/codecov-action@v2
with:
files: ./coverage.xml

python-tests-build-image:
runs-on: ubuntu-latest
container:
image: public.ecr.aws/opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2
options: --user root
steps:
- uses: actions/checkout@v3
- name: Install Pipenv and Dependencies
run: |
pipenv install
- name: Check for Sorted Imports
run: |
pipenv run isort --check .
- name: Enforce Style Guide
run: |
pipenv run flake8 .
- name: Run Type Checker
run: |
pipenv run mypy .
- name: Run Tests with Coverage
run: |
pipenv run coverage run -m pytest --cov=./src --cov-report=xml
- name: Upload Coverage Report
uses: codecov/codecov-action@v2
with:
files: ./coverage.xml
2 changes: 1 addition & 1 deletion .github/workflows/yaml-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: yaml-lint
on: [push, pull_request]

jobs:
test:
yaml-lint:
runs-on: ubuntu-latest
env:
PYTHON_VERSION: 3.7
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name = "pypi"
[packages]
pyyaml = "~=5.4"
types-PyYAML = "~=5.4"
requests = "~=2.31"
requests = "~=2.26"
types-requests = "~=2.25"
pre-commit = "~=2.15.0"
isort = "~=5.9"
Expand Down
Loading