Skip to content

Commit 97adcc6

Browse files
committed
feat: grow alloc
This adds the first set of tests for grow alloc. I will be adding more tests and updating the PR Signed-off-by: vsoch <vsoch@users.noreply.github.com>
1 parent a77ba46 commit 97adcc6

9 files changed

Lines changed: 1147 additions & 39 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz && tar -xvf go${G
1919
mv go /usr/local && rm go${GO_VERSION}.linux-amd64.tar.gz
2020
ENV PATH=$PATH:/usr/local/go/bin:/home/vscode/go/bin
2121

22-
RUN git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
22+
# RUN git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
23+
RUN git clone -b alloc-grow https://github.com/milroy/flux-sched /opt/flux-sched
2324

2425
# Add the group and user that match our ids
2526
RUN groupadd -g ${USER_GID} ${USERNAME} && \

.github/workflows/main.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
# container base and lib prefix
2424
test: [["fluxrm/flux-sched:noble", "/usr/lib"],
2525
["fluxrm/flux-sched:fedora40", "/usr/lib64"],
26-
["fluxrm/flux-sched:bookworm-amd64", "/usr/lib"],
27-
["fluxrm/flux-sched:el9", "/usr/lib64"]]
26+
["fluxrm/flux-sched:bookworm-amd64", "/usr/lib"]]
27+
# ["fluxrm/flux-sched:el9", "/usr/lib64"]]
2828

2929
container:
3030
image: ${{ matrix.test[0] }}
@@ -37,12 +37,12 @@ jobs:
3737
go-version: ^1.22
3838

3939
- name: flux-sched build
40-
run: git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
41-
# - name: build flux-sched
42-
# run: |
43-
# here=$(pwd)
44-
# cd /opt/flux-sched
45-
# mkdir build && cd build && cmake ../ && make -j && sudo make install
46-
# cd $here
40+
run: git clone -b grow-alloc https://github.com/milroy/flux-sched /opt/flux-sched
41+
- name: build flux-sched
42+
run: |
43+
here=$(pwd)
44+
cd /opt/flux-sched
45+
mkdir build && cd build && cmake ../ && make -j && sudo make install
46+
cd $here
4747
- name: Test
4848
run: LIB_PREFIX=${{ matrix.test[1] }} make test-v

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test:
2727

2828
.PHONY: test-v
2929
test-v:
30-
# $(COMMONENVVAR) $(BUILDENVVAR) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) go test -count 1 -run TestCancel -v -ldflags '-w' ./pkg/fluxcli ./pkg/types
30+
# $(COMMONENVVAR) $(BUILDENVVAR) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) go test -count 1 -run TestGrowAllocate -v -ldflags '-w' ./pkg/fluxcli ./pkg/types
3131
$(COMMONENVVAR) $(BUILDENVVAR) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) go test -v -ldflags '-w' ./pkg/fluxcli ./pkg/types
3232

3333
.PHONY: $(LOCALBIN)

0 commit comments

Comments
 (0)