Skip to content

Commit

Permalink
changing the evicted pod cleanup to produce no output so the healthch…
Browse files Browse the repository at this point in the history
…eck will pass in Jenkins.

also, adding in the proper path for pip in the pytest stage of the pipeline
  • Loading branch information
EliseCastle23 committed Mar 4, 2024
1 parent 6134055 commit ecaf1f5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ spec:
script {
try {
if(!skipUnitTests) {
sh 'pip3 install boto3 --upgrade --user'
sh 'pip3 install kubernetes --upgrade --user'
sh '/usr/local/bin/pip3 install boto3 --upgrade --user'
sh '/usr/local/bin/pip3 install kubernetes --upgrade --user'
sh 'python3 -m pytest cloud-automation/apis_configs/'
sh 'python3 -m pytest cloud-automation/gen3/lib/dcf/'
sh 'cd cloud-automation/tf_files/aws/modules/common-logging && python3 -m pytest testLambda.py'
Expand Down
2 changes: 1 addition & 1 deletion gen3/bin/healthcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ EOM
}

clear_evicted_pods() {
g3kubectl get pods -A -o json | jq '.items[] | select(.status.reason!=null) | select(.status.reason | contains("Evicted")) | "kubectl delete pods \(.metadata.name) -n \(.metadata.namespace)"' | xargs -n 1 bash -c 2> /dev/null || true
g3kubectl get pods -A -o json | jq '.items[] | select(.status.reason!=null) | select(.status.reason | contains("Evicted")) | "kubectl delete pods \(.metadata.name) -n \(.metadata.namespace)"' | xargs -n 1 bash -c 2> /dev/null || true > /dev/null 2>&1
}

gen3_healthcheck "$@"
Expand Down

0 comments on commit ecaf1f5

Please sign in to comment.