diff --git a/.github/workflows/e2e-build-images.yaml b/.github/workflows/e2e-build-images.yaml index 46605d19a..6693eb7e9 100644 --- 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/build_image/00_check_vm_image --codename ${{ matrix.codename }} ${force}) + IMAGE_VERSION=$(go run ./e2e/cmd/build_base_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/build_image/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_base_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/build_image/02_create_vm_template + go run ./e2e/cmd/build_base_image/02_create_vm_template diff --git a/go.mod b/go.mod index f709d85dc..583707ddc 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/godbus/dbus/v5 v5.1.0 github.com/golang/protobuf v1.5.3 github.com/gomarkdown/markdown v0.0.0-20230922105210-14b16010c2ee - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/kardianos/service v1.2.2 github.com/leonelquinteros/gotext v1.5.3-0.20230829162019-37f474cfb069 github.com/maruel/natural v1.1.0 diff --git a/go.sum b/go.sum index 9e900b45d..8d684a950 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=