-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make collect-info multi-arch compatible, providing arm64 support
Additional adjustments to integration tests: - Had to remove the macos step, as the macos runners are now arm64 mX based and don't support docker. - Upgraded cass-operator, Cassandra, and DSE versions used in the tests. - Reduced DSE tests to single node. - Had to use `--force-conflicts --server-side` on cass-operator, see k8ssandra/k8ssandra#1380 - Added iproute2 to test images (to get `ip` command) - A darwin arm64 `collect-info` is built if the local machine is such and `ructc` is on the path, and this is used when running `ds-collector`, on the assumption this is a mac mX machine running integration tests. A clear message is printed if this assumption is wrong and how to remedy it. - The use of `df` command is made macos friendly in `ds-collector` (for the above point). Also added the licence header to ds-collector script.
- Loading branch information
1 parent
f246161
commit 9bf4d8e
Showing
14 changed files
with
110 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,26 +25,29 @@ jobs: | |
- name: Test ds-collector | ||
working-directory: ds-collector-tests | ||
run: | | ||
sudo apt-get install -y binfmt-support qemu qemu-user-static | ||
echo "Testing ds-collector" | ||
make -f cluster-vanilla-ssh-docker.make | ||
test-collector-ssh-docker-macos: | ||
runs-on: macos-11 | ||
|
||
steps: | ||
- uses: docker-practice/[email protected] | ||
- uses: actions/checkout@v2 | ||
- name: Set up JDK 1.8 | ||
uses: actions/setup-java@v1 | ||
with: | ||
java-version: 1.8 | ||
|
||
- name: Test ds-collector | ||
working-directory: ds-collector-tests | ||
run: | | ||
brew install coreutils | ||
echo "Testing ds-collector" | ||
make -f cluster-one-node-vanilla-ssh-docker.make | ||
# TODO – fix when gha offers any arm64 runner (that can run docker) | ||
# | ||
# test-collector-ssh-docker-macos: | ||
# runs-on: macos-14 | ||
# | ||
# steps: | ||
# - uses: docker-practice/[email protected] | ||
# - uses: actions/checkout@v2 | ||
# - name: Set up JDK 1.8 | ||
# uses: actions/setup-java@v1 | ||
# with: | ||
# java-version: 1.8 | ||
# | ||
# - name: Test ds-collector | ||
# working-directory: ds-collector-tests | ||
# run: | | ||
# brew install coreutils | ||
# echo "Testing ds-collector" | ||
# make -f cluster-one-node-vanilla-ssh-docker.make | ||
|
||
test-collector-k8s-cassandra: | ||
runs-on: ubuntu-latest | ||
|
@@ -59,6 +62,7 @@ jobs: | |
- name: Test ds-collector | ||
working-directory: ds-collector-tests | ||
run: | | ||
sudo apt-get install -y binfmt-support qemu qemu-user-static | ||
echo "Testing ds-collector" | ||
make -f cluster-vanilla-k8s.make | ||
|
@@ -75,6 +79,7 @@ jobs: | |
- name: Test ds-collector | ||
working-directory: ds-collector-tests | ||
run: | | ||
sudo apt-get install -y binfmt-support qemu qemu-user-static | ||
echo "Testing ds-collector" | ||
make -f cluster-dse-k8s.make | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,38 @@ | ||
## Compile rust binaries for Linux | ||
|
||
The following is done for you in the top directory `Makefile`. Bundled `ds-collector.*.tar.gz` tarballs should already contain multiple `collect-info` binaries to cover your architecture. The following instructions are normally not required. | ||
|
||
|
||
## Compile rust binaries for Linux amd64 and arm64 | ||
|
||
docker run -v $PWD:/volume -w /volume -t clux/muslrust rustc --target x86_64-unknown-linux-musl *.rs | ||
|
||
|
||
On Mac aarch: | ||
|
||
docker run --platform linux/arm64 -v $PWD:/volume -w /volume -t clux/muslrust rustc --target aarch64-unknown-linux-musl *.rs | ||
|
||
mv collect-info ../collect-info.aarch64-unknown-linux-musl | ||
|
||
docker run --platform linux/amd64 -v $PWD:/volume -w /volume -t clux/muslrust rustc --target x86_64-unknown-linux-musl *.rs | ||
|
||
mv collect-info ../collect-info.x86_64-unknown-linux-musl | ||
|
||
|
||
On Linux (or old Mac): | ||
|
||
sudo apt-get install -y qemu binfmt-support qemu-user-static | ||
|
||
docker run --platform linux/arm64 -v /usr/bin/qemu-aarch64-static:/usr/bin/qemu-aarch64-static -v $PWD:/volume -w /volume -t clux/muslrust rustc --target aarch64-unknown-linux-musl *.rs | ||
|
||
mv ../collect-info collect-info.aarch64-unknown-linux-musl | ||
|
||
docker run --platform linux/amd64 -v $PWD:/volume -w /volume -t clux/muslrust rustc --target x86_64-unknown-linux-musl *.rs | ||
|
||
mv collect-info ../collect-info.x86_64-unknown-linux-musl | ||
|
||
|
||
On Mac aarch, to run integration tests on same Mac aarch: | ||
|
||
rustc *.rs | ||
|
||
mv collect-info ../collect-info.aarch64-apple-darwin |