Organize suites in subdirectories

As opposed to a flat structure.
ubuntu · Oct 17, 2023 · b6e158b · b6e158b
1 parent 14a9875
commit b6e158b
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/e2e-build-images.yaml b/.github/workflows/e2e-build-images.yaml
@@ -83,7 +83,7 @@ jobs:
               force="--force"
           fi
 
-          IMAGE_VERSION=$(go run ./e2e/cmd/00_check_vm_image --codename ${{ matrix.codename }} ${force})
+          IMAGE_VERSION=$(go run ./e2e/cmd/build_image/00_check_vm_image --codename ${{ matrix.codename }} ${force})
           if [ ! -z "${IMAGE_VERSION}" ]; then
               echo image-version=$IMAGE_VERSION >> $GITHUB_OUTPUT
           fi
@@ -100,8 +100,8 @@ jobs:
       - name: Build base VM
         if: steps.check-vm-template.outputs.image-version != ''
         run: |
-          go run ./e2e/cmd/01_prepare_base_vm --vm-image ${{ steps.check-vm-template.outputs.image-version }} --codename ${{ matrix.codename }} --ssh-key ~/.ssh/id_rsa-e2e
+          go run ./e2e/cmd/build_image/01_prepare_base_vm --vm-image ${{ steps.check-vm-template.outputs.image-version }} --codename ${{ matrix.codename }} --ssh-key ~/.ssh/id_rsa-e2e
       - name: Create template version
         if: steps.check-vm-template.outputs.image-version != ''
         run: |
-          go run ./e2e/cmd/02_create_vm_template
+          go run ./e2e/cmd/build_image/02_create_vm_template
diff --git a/e2e/cmd/00_check_vm_image/main.go → ...cmd/build_image/00_check_vm_image/main.go b/e2e/cmd/00_check_vm_image/main.go → ...cmd/build_image/00_check_vm_image/main.go
diff --git a/e2e/cmd/01_prepare_base_vm/main.go → ...md/build_image/01_prepare_base_vm/main.go b/e2e/cmd/01_prepare_base_vm/main.go → ...md/build_image/01_prepare_base_vm/main.go
diff --git a/e2e/cmd/02_create_vm_template/main.go → ...build_image/02_create_vm_template/main.go b/e2e/cmd/02_create_vm_template/main.go → ...build_image/02_create_vm_template/main.go
diff --git a/e2e/cmd/10_build_adsys_deb/main.go → e2e/cmd/run_tests/00_build_adsys_deb/main.go b/e2e/cmd/10_build_adsys_deb/main.go → e2e/cmd/run_tests/00_build_adsys_deb/main.go
diff --git a/e2e/cmd/11_provision_client/main.go → ...cmd/run_tests/01_provision_client/main.go b/e2e/cmd/11_provision_client/main.go → ...cmd/run_tests/01_provision_client/main.go