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

chore(dp): Show timestamps in integrations_tests #12881

Merged
merged 1 commit into from
Jun 3, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dp-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -412,9 +412,9 @@ jobs:
for pod in $(kubectl get pods -o custom-columns=NAME:.metadata.name --no-headers);
do
if [[ "$pod" == "postgres-database-0" ]]; then
kubectl logs $pod --container postgres-test > ${TEST_DIR}/k8s-pods-logs/${pod}.log;
kubectl logs --timestamps=true $pod --container postgres-test > ${TEST_DIR}/k8s-pods-logs/${pod}.log;
else
kubectl logs $pod > ${TEST_DIR}/k8s-pods-logs/${pod}.log;
kubectl logs --timestamps=true $pod > ${TEST_DIR}/k8s-pods-logs/${pod}.log;
fi;
done
- name: Collect Elasticsearch data
Expand Down
4 changes: 2 additions & 2 deletions dp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ _generate_harness_config:
.PHONY: _ci_integration_tests_no_orc8r
_ci_integration_tests_no_orc8r: _install_skaffold_ci
skaffold run -p integration-tests-no-orc8
kubectl logs test-runner -f | tee /tmp/integration-tests-results/$@.txt
kubectl logs test-runner --timestamps=true -f | tee /tmp/integration-tests-results/$@.txt
@set -e;\
sleep 2;\
SUCCESS=$$(kubectl get pods test-runner -o jsonpath='{.status.phase}');\
Expand All @@ -162,7 +162,7 @@ _ci_integration_tests_no_orc8r: _install_skaffold_ci
.PHONY: _ci_integration_tests_orc8r
_ci_integration_tests_orc8r: _install_skaffold_ci
skaffold run -p orc8r-deployment,integration-tests-no-orc8,integration-tests-orc8r-only
kubectl logs test-runner-orc8r -f | tee /tmp/integration-tests-results/$@.txt
kubectl logs test-runner-orc8r --timestamps=true -f | tee /tmp/integration-tests-results/$@.txt
@set -e;\
sleep 2;\
SUCCESS=$$(kubectl get pods test-runner-orc8r -o jsonpath='{.status.phase}');\
Expand Down
1 change: 1 addition & 0 deletions dp/cloud/python/magma/test_runner/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ coverage~=5.5
mock==4.0.3
parameterized==0.8.1
pytest==6.2.3
pytest-instafail==0.4.2
psycopg2-binary==2.8.6
grpcio==1.37.1
grpcio-tools==1.37.1
Expand Down
2 changes: 1 addition & 1 deletion dp/tools/deployment/tests/test_runner_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
name: test-runner-dev
imagePullPolicy: IfNotPresent
command: ["/entrypoint.sh"]
args: ["-m", "pytest", "-vvv", "-s", "-m", "local", "--junit-xml=/backend/test_runner/test-results/test_report.xml", "tests"]
args: ["-m", "pytest", "-vvv", "-s", "--instafail", "-m", "local", "--junit-xml=/backend/test_runner/test-results/test_report.xml", "tests"]
volumeMounts:
- name: test-results
mountPath: /backend/test_runner/test-results
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
name: test-runner-orc8
imagePullPolicy: IfNotPresent
command: ["/entrypoint.sh"]
args: ["-m", "pytest", "-vvv", "-s", "-m", "orc8r", "--junit-xml=/backend/test_runner/test-results/test_report.xml", "tests"]
args: ["-m", "pytest", "-vvv", "-s", "--instafail", "-m", "orc8r", "--junit-xml=/backend/test_runner/test-results/test_report.xml", "tests"]
volumeMounts:
- name: test-results
mountPath: /backend/test_runner/test-results
Expand Down