Skip to content

Commit

Permalink
ci: use k3s to deploy longhorn and node-disk-manager
Browse files Browse the repository at this point in the history
    - we could drop rancher in this case

Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit cf3d0b4)
  • Loading branch information
Vicente-Cheng authored and bk201 committed Sep 24, 2024
1 parent 423e8e6 commit df0c7c1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/basic-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,19 @@ jobs:
- name: "Local Deployment (Harvester+Longhorn+Node-Disk-Manager) for testing"
id: vm_deploy
run: |
rm -rf ndm-vagrant-rancherd
git clone https://github.com/harvester/vagrant-rancherd ndm-vagrant-rancherd
pushd ndm-vagrant-rancherd
./new_cluster.sh
yq e -i ".longhorn_version = \"1.5.3\"" settings.yaml
rm -rf ndm-vagrant-k3s
git clone https://github.com/bk201/vagrant-k3s ndm-vagrant-k3s
pushd ndm-vagrant-k3s
yq e -i ".cluster_size = 1" settings.yaml
./new-cluster.sh
yq e -i ".longhorn_version = \"1.7.1\"" settings.yaml
./scripts/deploy_longhorn.sh
cp ../ci/scripts/deploy_ndm.sh ./deploy_ndm.sh
./deploy_ndm.sh
popd
- name: "Add disk"
run: |
pushd ndm-vagrant-rancherd
pushd ndm-vagrant-k3s
./scripts/attach-disk.sh node1
sleep 30
popd
Expand All @@ -63,14 +64,14 @@ jobs:
cat ci/charts/ndm-override.yaml
- name: "Upgrade NDM"
run: |
pushd ndm-vagrant-rancherd
pushd ndm-vagrant-k3s
cp ../ci/scripts/upgrade_ndm.sh ./upgrade_ndm.sh
./upgrade_ndm.sh
popd
- name: "Run Basic Test"
id: basic-test
run: |
pushd ndm-vagrant-rancherd
pushd ndm-vagrant-k3s
vagrant ssh-config node1 > ../ssh-config
cp kubeconfig ../kubeconfig
popd
Expand All @@ -83,6 +84,6 @@ jobs:
- name: "Tear Down / Cleanup"
if: steps.vm_deploy.conclusion == 'success'
run: |
pushd ndm-vagrant-rancherd
pushd ndm-vagrant-k3s
vagrant destroy -f --parallel
popd
4 changes: 2 additions & 2 deletions tests/integration/test_1_disk_hotplug_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import (
*
* NOTE: The default qcow2 and xml location (created by initial operation) is `/tmp/hotplug_disks/`.
* File names are `node1-sda.qcow2` and `node1-sda.xml`.
* The target node name is `ndm-vagrant-rancherd_node1`.
* The target node name is `ndm-vagrant-k3s_node1`.
*/

const (
hotplugTargetNodeName = "ndm-vagrant-rancherd_node1"
hotplugTargetNodeName = "ndm-vagrant-k3s_node1"
hotplugDiskXMLFileName = "/tmp/hotplug_disks/node1-sda.xml"
hotplugTargetDiskName = "sda"
)
Expand Down

0 comments on commit df0c7c1

Please sign in to comment.