Skip to content

Commit

Permalink
sleep one minute and minimize fluxion build
Browse files Browse the repository at this point in the history
Signed-off-by: vsoch <[email protected]>
  • Loading branch information
vsoch committed Aug 2, 2024
1 parent da45c95 commit 188cf0c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ helm install \
fluxnetes chart/

# These containers should already be loaded into minikube
echo "Sleeping 20 seconds waiting for scheduler deploy"
sleep 20
echo "Sleeping 1 minute waiting for scheduler deploy"
sleep 60
kubectl get pods

# This will get the fluence image (which has scheduler and sidecar), which should be first
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
- image: {{ .Values.sidecar.image }}
imagePullPolicy: {{ .Values.sidecar.pullPolicy }}
command:
- /go/src/fluxnetes/bin/server
- /bin/fluxion-service
- --policy={{ .Values.sidecar.policy }}
- --port={{ .Values.sidecar.port }}
{{ if .Values.scheduler.enableExternalService }}- --external-service{{ end }}
Expand Down
11 changes: 7 additions & 4 deletions src/build/scheduler/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxrm/flux-sched:jammy
FROM fluxrm/flux-sched:jammy as builder

USER root
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -28,6 +28,9 @@ COPY fluxnetes Makefile /go/src/fluxnetes/

RUN go mod tidy && \
go mod vendor && \
make server FLUX_SCHED_ROOT=/opt/flux-sched && \
mkdir -p /home/data/jobspecs /home/data/jgf && \
chmod -R ugo+rwx /home/data
make server FLUX_SCHED_ROOT=/opt/flux-sched

FROM ubuntu:jammy
COPY --from=builder /opt/flux-sched /opt/flux-sched
COPY --from=builder /go/src/fluxnetes/bin/server /bin/fluxion-service
RUN mkdir -p /home/data/jobspecs /home/data/jgf && chmod -R ugo+rwx /home/data

0 comments on commit 188cf0c

Please sign in to comment.