Skip to content

Commit

Permalink
test: update Talos versions in Image Factory tests
Browse files Browse the repository at this point in the history 
Add Talos 1.7, remove Talos 1.3, as Omni minimum supported version right
now is 1.4.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
@smira
smira committed Sep 3, 2024
1 parent ec3844c commit db6ef1e
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 83 deletions.
59 changes: 31 additions & 28 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-08-27T12:42:20Z by kres 8e4bbb4.
# Generated on 2024-09-03T14:18:03Z by kres b5ca957.

name: default
concurrency:
Expand Down Expand Up @@ -1534,34 +1534,45 @@ jobs:
PLATFORM: linux/amd64
run: |
make images-essential
- name: factory-1.6-iso
- name: factory-1.7-iso
env:
FACTORY_BOOT_METHOD: iso
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.6.1
FACTORY_VERSION: v1.6.0
KUBERNETES_VERSION: 1.29.0
FACTORY_UPGRADE_VERSION: v1.7.6
FACTORY_VERSION: v1.7.5
KUBERNETES_VERSION: 1.30.1
run: |
sudo -E make e2e-image-factory
- name: factory-1.6-image
- name: factory-1.7-image
env:
FACTORY_BOOT_METHOD: disk-image
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.6.1
FACTORY_VERSION: v1.6.0
KUBERNETES_VERSION: 1.29.0
FACTORY_UPGRADE_VERSION: v1.7.6
FACTORY_VERSION: v1.7.5
KUBERNETES_VERSION: 1.30.1
run: |
sudo -E make e2e-image-factory
- name: factory-1.6-pxe
- name: factory-1.7-pxe
env:
FACTORY_BOOT_METHOD: pxe
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_VERSION: v1.6.1
KUBERNETES_VERSION: 1.29.0
FACTORY_VERSION: v1.7.6
KUBERNETES_VERSION: 1.30.1
run: |
sudo -E make e2e-image-factory
- name: factory-1.7-secureboot
env:
FACTORY_BOOT_METHOD: secureboot-iso
FACTORY_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE_VERSION: v1.7.6
FACTORY_VERSION: v1.7.5
KUBERNETES_VERSION: 1.30.1
run: |
sudo -E make e2e-image-factory
- name: factory-1.6-secureboot
Expand All @@ -1575,34 +1586,26 @@ jobs:
KUBERNETES_VERSION: 1.29.0
run: |
sudo -E make e2e-image-factory
- name: factory-1.5-iso
- name: factory-1.6-iso
env:
FACTORY_BOOT_METHOD: iso
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.5.5
FACTORY_VERSION: v1.5.5
KUBERNETES_VERSION: 1.28.5
FACTORY_UPGRADE_VERSION: v1.6.1
FACTORY_VERSION: v1.6.0
KUBERNETES_VERSION: 1.29.0
run: |
sudo -E make e2e-image-factory
- name: factory-1.3-iso
- name: factory-1.5-iso
env:
FACTORY_BOOT_METHOD: iso
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.3.7
FACTORY_VERSION: v1.3.7
KUBERNETES_VERSION: 1.26.5
run: |
sudo -E make e2e-image-factory
- name: factory-1.3-image
env:
FACTORY_BOOT_METHOD: disk-image
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_VERSION: v1.3.7
KUBERNETES_VERSION: 1.26.5
FACTORY_UPGRADE_VERSION: v1.5.5
FACTORY_VERSION: v1.5.5
KUBERNETES_VERSION: 1.28.5
run: |
sudo -E make e2e-image-factory
- name: save artifacts
Expand Down
59 changes: 31 additions & 28 deletions .github/workflows/integration-image-factory-cron.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-08-25T07:59:04Z by kres 8e4bbb4.
# Generated on 2024-09-03T14:18:03Z by kres b5ca957.

name: integration-image-factory-cron
concurrency:
Expand Down Expand Up @@ -95,34 +95,45 @@ jobs:
PLATFORM: linux/amd64
run: |
make images-essential
- name: factory-1.6-iso
- name: factory-1.7-iso
env:
FACTORY_BOOT_METHOD: iso
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.6.1
FACTORY_VERSION: v1.6.0
KUBERNETES_VERSION: 1.29.0
FACTORY_UPGRADE_VERSION: v1.7.6
FACTORY_VERSION: v1.7.5
KUBERNETES_VERSION: 1.30.1
run: |
sudo -E make e2e-image-factory
- name: factory-1.6-image
- name: factory-1.7-image
env:
FACTORY_BOOT_METHOD: disk-image
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.6.1
FACTORY_VERSION: v1.6.0
KUBERNETES_VERSION: 1.29.0
FACTORY_UPGRADE_VERSION: v1.7.6
FACTORY_VERSION: v1.7.5
KUBERNETES_VERSION: 1.30.1
run: |
sudo -E make e2e-image-factory
- name: factory-1.6-pxe
- name: factory-1.7-pxe
env:
FACTORY_BOOT_METHOD: pxe
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_VERSION: v1.6.1
KUBERNETES_VERSION: 1.29.0
FACTORY_VERSION: v1.7.6
KUBERNETES_VERSION: 1.30.1
run: |
sudo -E make e2e-image-factory
- name: factory-1.7-secureboot
env:
FACTORY_BOOT_METHOD: secureboot-iso
FACTORY_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE_VERSION: v1.7.6
FACTORY_VERSION: v1.7.5
KUBERNETES_VERSION: 1.30.1
run: |
sudo -E make e2e-image-factory
- name: factory-1.6-secureboot
Expand All @@ -136,34 +147,26 @@ jobs:
KUBERNETES_VERSION: 1.29.0
run: |
sudo -E make e2e-image-factory
- name: factory-1.5-iso
- name: factory-1.6-iso
env:
FACTORY_BOOT_METHOD: iso
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.5.5
FACTORY_VERSION: v1.5.5
KUBERNETES_VERSION: 1.28.5
FACTORY_UPGRADE_VERSION: v1.6.1
FACTORY_VERSION: v1.6.0
KUBERNETES_VERSION: 1.29.0
run: |
sudo -E make e2e-image-factory
- name: factory-1.3-iso
- name: factory-1.5-iso
env:
FACTORY_BOOT_METHOD: iso
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE: "true"
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.3.7
FACTORY_VERSION: v1.3.7
KUBERNETES_VERSION: 1.26.5
run: |
sudo -E make e2e-image-factory
- name: factory-1.3-image
env:
FACTORY_BOOT_METHOD: disk-image
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_VERSION: v1.3.7
KUBERNETES_VERSION: 1.26.5
FACTORY_UPGRADE_VERSION: v1.5.5
FACTORY_VERSION: v1.5.5
KUBERNETES_VERSION: 1.28.5
run: |
sudo -E make e2e-image-factory
- name: save artifacts
Expand Down
57 changes: 30 additions & 27 deletions .kres.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1436,36 +1436,47 @@ spec:
PLATFORM: linux/amd64
IMAGER_ARGS: "--extra-kernel-arg=console=ttyS0"
IMAGE_REGISTRY: registry.dev.siderolabs.io
- name: factory-1.6-iso
- name: factory-1.7-iso
command: e2e-image-factory
withSudo: true
environment:
FACTORY_BOOT_METHOD: iso
FACTORY_VERSION: v1.6.0
FACTORY_VERSION: v1.7.5
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
KUBERNETES_VERSION: 1.29.0
KUBERNETES_VERSION: 1.30.1
FACTORY_UPGRADE: true
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.6.1
- name: factory-1.6-image
FACTORY_UPGRADE_VERSION: v1.7.6
- name: factory-1.7-image
command: e2e-image-factory
withSudo: true
environment:
FACTORY_BOOT_METHOD: disk-image
FACTORY_VERSION: v1.6.0
FACTORY_VERSION: v1.7.5
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
KUBERNETES_VERSION: 1.29.0
KUBERNETES_VERSION: 1.30.1
FACTORY_UPGRADE: true
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.6.1
- name: factory-1.6-pxe
FACTORY_UPGRADE_VERSION: v1.7.6
- name: factory-1.7-pxe
command: e2e-image-factory
withSudo: true
environment:
FACTORY_BOOT_METHOD: pxe
FACTORY_VERSION: v1.6.1
FACTORY_VERSION: v1.7.6
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
KUBERNETES_VERSION: 1.29.0
KUBERNETES_VERSION: 1.30.1
- name: factory-1.7-secureboot
command: e2e-image-factory
withSudo: true
environment:
FACTORY_BOOT_METHOD: secureboot-iso
FACTORY_VERSION: v1.7.5
FACTORY_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
KUBERNETES_VERSION: 1.30.1
FACTORY_UPGRADE: true
FACTORY_UPGRADE_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE_VERSION: v1.7.6
- name: factory-1.6-secureboot
command: e2e-image-factory
withSudo: true
Expand All @@ -1477,36 +1488,28 @@ spec:
FACTORY_UPGRADE: true
FACTORY_UPGRADE_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
FACTORY_UPGRADE_VERSION: v1.6.1
- name: factory-1.5-iso
- name: factory-1.6-iso
command: e2e-image-factory
withSudo: true
environment:
FACTORY_BOOT_METHOD: iso
FACTORY_VERSION: v1.5.5
FACTORY_VERSION: v1.6.0
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
KUBERNETES_VERSION: 1.28.5
KUBERNETES_VERSION: 1.29.0
FACTORY_UPGRADE: true
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.5.5
- name: factory-1.3-iso
FACTORY_UPGRADE_VERSION: v1.6.1
- name: factory-1.5-iso
command: e2e-image-factory
withSudo: true
environment:
FACTORY_BOOT_METHOD: iso
FACTORY_VERSION: v1.3.7
FACTORY_VERSION: v1.5.5
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
KUBERNETES_VERSION: 1.26.5
KUBERNETES_VERSION: 1.28.5
FACTORY_UPGRADE: true
FACTORY_UPGRADE_SCHEMATIC: cf9b7aab9ed7c365d5384509b4d31c02fdaa06d2b3ac6cc0bc806f28130eff1f
FACTORY_UPGRADE_VERSION: v1.3.7
- name: factory-1.3-image
command: e2e-image-factory
withSudo: true
environment:
FACTORY_BOOT_METHOD: disk-image
FACTORY_VERSION: v1.3.7
FACTORY_SCHEMATIC: 376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
KUBERNETES_VERSION: 1.26.5
FACTORY_UPGRADE_VERSION: v1.5.5
- name: save-talos-logs
conditions:
- always
Expand Down

0 comments on commit db6ef1e

Please sign in to comment.