Skip to content

Commit d453a42

Browse files
cmccullycmccully
committed
Revert to single pod architecture because shared pvcs don't really work in kind.
1 parent 6d66dac commit d453a42

File tree

3 files changed

+274
-448
lines changed

3 files changed

+274
-448
lines changed

Diff for: ‎.github/workflows/e2e.yaml

+18-27
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,19 @@ jobs:
4141
kubectl apply -k banzai/tests/k8s
4242
4343
# Wait for banzai to be ready
44-
kubectl wait --for=condition=Ready --timeout=60m pods -l group=banzai-e2e-test
45-
46-
LISTENER_POD=$(kubectl get pods -l app=banzai-listener -o jsonpath='{.items[0].metadata.name}')
47-
echo "LISTENER_POD=${LISTENER_POD}" >> $GITHUB_ENV
48-
49-
WORKERS_POD=$(kubectl get pods -l app=banzai-celery-workers -o jsonpath='{.items[0].metadata.name}')
50-
echo "WORKERS_POD=${WORKERS_POD}" >> $GITHUB_ENV
51-
52-
LARGE_WORKERS_POD=$(kubectl get pods -l app=banzai-large-celery-workers -o jsonpath='{.items[0].metadata.name}')
53-
echo "LARGE_WORKERS_POD=${LARGE_WORKERS_POD}" >> $GITHUB_ENV
44+
kubectl wait --for=condition=Ready --timeout=60m pod/banzai-e2e-test
5445
5546
- name: Test Super Bias Creation
5647
run: |
5748
set +e
5849
export START=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
59-
kubectl exec ${LISTENER_POD} -c banzai-listener -- pytest -s --pyargs banzai --durations=0 --junitxml=/archive/engineering/pytest-master-bias.xml -m master_bias
50+
kubectl exec banzai-e2e-test -c banzai-listener -- pytest -s --pyargs banzai --durations=0 --junitxml=/archive/engineering/pytest-master-bias.xml -m master_bias
6051
EXIT_CODE=$?
6152
6253
# Always print logs even if (especially if?) the reduction fails
63-
kubectl logs ${LISTENER_POD} --since-time=$START --all-containers --prefix=true
64-
kubectl logs ${WORKERS_POD} --since-time=$START --all-containers --prefix=true
65-
kubectl logs ${LARGE_WORKERS_POD} --since-time=$START --all-containers --prefix=true
54+
kubectl logs banzai-e2e-test -c banzai-listener --since-time=$START --prefix=true
55+
kubectl logs banzai-e2e-test -c banzai-celery-workers --since-time=$START --prefix=true
56+
kubectl logs banzai-e2e-test -c banzai-large-celery-workers --since-time=$START --prefix=true
6657
6758
# Exit with the captured status so the job properly fails or succeeds
6859
exit $EXIT_CODE
@@ -72,14 +63,14 @@ jobs:
7263
set +e
7364
export START=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
7465
75-
kubectl exec ${LISTENER_POD} -c banzai-listener -- pytest -s --pyargs banzai --durations=0 --junitxml=/archive/engineering/pytest-master-dark.xml -m master_dark
66+
kubectl exec banzai-e2e-test -c banzai-listener -- pytest -s --pyargs banzai --durations=0 --junitxml=/archive/engineering/pytest-master-dark.xml -m master_dark
7667
EXIT_CODE=$?
7768
7869
# Always print logs even if (especially if?) the reduction fails
79-
kubectl logs ${LISTENER_POD} --since-time=$START --all-containers --prefix=true
80-
kubectl logs ${WORKERS_POD} --since-time=$START --all-containers --prefix=true
81-
kubectl logs ${LARGE_WORKERS_POD} --since-time=$START --all-containers --prefix=true
82-
70+
kubectl logs banzai-e2e-test -c banzai-listener --since-time=$START --prefix=true
71+
kubectl logs banzai-e2e-test -c banzai-celery-workers --since-time=$START --prefix=true
72+
kubectl logs banzai-e2e-test -c banzai-large-celery-workers --since-time=$START --prefix=true
73+
8374
# Exit with the captured status so the job properly fails or succeeds
8475
exit $EXIT_CODE
8576
@@ -88,13 +79,13 @@ jobs:
8879
set +e
8980
export START=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
9081
91-
kubectl exec ${LISTENER_POD} -c banzai-listener -- pytest -s --pyargs banzai --durations=0 --junitxml=/archive/engineering/pytest-master-flat.xml -m master_flat
82+
kubectl exec banzai-e2e-test -c banzai-listener -- pytest -s --pyargs banzai --durations=0 --junitxml=/archive/engineering/pytest-master-flat.xml -m master_flat
9283
EXIT_CODE=$?
9384
9485
# Always print logs even if (especially if?) the reduction fails
95-
kubectl logs ${LISTENER_POD} --since-time=$START --all-containers --prefix=true
96-
kubectl logs ${WORKERS_POD} --since-time=$START --all-containers --prefix=true
97-
kubectl logs ${LARGE_WORKERS_POD} --since-time=$START --all-containers --prefix=true
86+
kubectl logs banzai-e2e-test -c banzai-listener --since-time=$START --prefix=true
87+
kubectl logs banzai-e2e-test -c banzai-celery-workers --since-time=$START --prefix=true
88+
kubectl logs banzai-e2e-test -c banzai-large-celery-workers --since-time=$START --prefix=true
9889
9990
# Exit with the captured status so the job properly fails or succeeds
10091
exit $EXIT_CODE
@@ -104,13 +95,13 @@ jobs:
10495
set +e
10596
export START=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
10697
107-
kubectl exec ${LISTENER_POD} -c banzai-listener -- pytest -s --pyargs banzai --durations=0 --junitxml=/archive/engineering/pytest-science-files.xml -m science_files
98+
kubectl exec banzai-e2e-test -c banzai-listener -- pytest -s --pyargs banzai --durations=0 --junitxml=/archive/engineering/pytest-science-files.xml -m science_files
10899
EXIT_CODE=$?
109100
110101
# Always print logs even if (especially if?) the reduction fails
111-
kubectl logs ${LISTENER_POD} --since-time=$START --all-containers --prefix=true
112-
kubectl logs ${WORKERS_POD} --since-time=$START --all-containers --prefix=true
113-
kubectl logs ${LARGE_WORKERS_POD} --since-time=$START --all-containers --prefix=true
102+
kubectl logs banzai-e2e-test -c banzai-listener --since-time=$START --prefix=true
103+
kubectl logs banzai-e2e-test -c banzai-celery-workers --since-time=$START --prefix=true
104+
kubectl logs banzai-e2e-test -c banzai-large-celery-workers --since-time=$START --prefix=true
114105
115106
# Exit with the captured status so the job properly fails or succeeds
116107
exit $EXIT_CODE

0 commit comments

Comments
 (0)