diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdf705c36a04ffc9b0e78105fecb673a411279e2..5d9e5cb3bd924de543d017d3764316bae754e3aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,13 +33,6 @@ render-pages:
variables:
type: fixedfunction
-.iot:
- variables:
- type: iot
- # IoT image jobs rely on passing credentials through the LAVA definition,
- # so make sure that they're all private.
- visibility: '{group: [Collabora]}'
-
.hmi:
variables:
type: hmi
@@ -77,11 +70,6 @@ render-pages:
architecture: arm64
board: rpi64
-.cloud2edge-vars:
- variables:
- TENANT: dev.apertis.test
- C2E_DEVICE_ID: dev.apertis.test.ci:$CI_COMMIT_REF_SLUG-$CI_PIPELINE_IID-$architecture-$type-$board
-
.generate-tests-apt:
extends: .generate-tests
tags:
@@ -178,78 +166,6 @@ run-tests-apt-arm64-fixedfunction-rpi64-rpi4:
- job: generate-tests-apt-arm64-fixedfunction-rpi64-rpi4
artifact: child-pipeline.yaml
-generate-tests-apt-amd64-iot-uefi:
- extends:
- - .generate-tests-apt
- - .amd64-uefi
- - .iot
-
-run-tests-apt-amd64-iot-uefi:
- extends:
- - .run-tests
- - .amd64-uefi
- - .iot
- - .cloud2edge-vars
- trigger:
- strategy: depend
- include:
- - job: generate-tests-apt-amd64-iot-uefi
- artifact: child-pipeline.yaml
-
-generate-tests-apt-armhf-iot-uboot:
- extends:
- - .generate-tests-apt
- - .armhf-uboot
- - .iot
-
-run-tests-apt-armhf-iot-uboot:
- extends:
- - .run-tests
- - .armhf-uboot
- - .iot
- - .cloud2edge-vars
- trigger:
- strategy: depend
- include:
- - job: generate-tests-apt-armhf-iot-uboot
- artifact: child-pipeline.yaml
-
-generate-tests-apt-arm64-iot-uboot:
- extends:
- - .generate-tests-apt
- - .arm64-uboot
- - .iot
-
-run-tests-apt-arm64-iot-uboot:
- extends:
- - .run-tests
- - .arm64-uboot
- - .iot
- - .cloud2edge-vars
- trigger:
- strategy: depend
- include:
- - job: generate-tests-apt-arm64-iot-uboot
- artifact: child-pipeline.yaml
-
-generate-tests-apt-arm64-iot-rpi64-rpi4:
- extends:
- - .generate-tests-apt
- - .arm64-rpi64
- - .iot
-
-run-tests-apt-arm64-iot-rpi64-rpi4:
- extends:
- - .run-tests
- - .arm64-rpi64
- - .iot
- - .cloud2edge-vars
- trigger:
- strategy: depend
- include:
- - job: generate-tests-apt-arm64-iot-rpi64-rpi4
- artifact: child-pipeline.yaml
-
generate-tests-apt-amd64-hmi-uefi:
extends:
- .generate-tests-apt
diff --git a/generate-jobs.py b/generate-jobs.py
index 2d9e9df7835fafac63c5098c17b4862382baa450..56593de41936524a6bc6af60268a29b924fbbd9b 100755
--- a/generate-jobs.py
+++ b/generate-jobs.py
@@ -247,7 +247,7 @@ parser.add_argument('--deployment', choices=['ostree', 'apt', 'nfs', 'lxc'],
required=True,
help="set the deployment method of the image")
parser.add_argument('--type',
- choices=['hmi', 'fixedfunction', 'iot', 'basesdk', 'sdk', 'nfsroot', 'tiny-lxc'],
+ choices=['hmi', 'fixedfunction', 'basesdk', 'sdk', 'nfsroot', 'tiny-lxc'],
required=True,
help="set the type of the image to be tested")
parser.add_argument('--release', type=str, required=True,
diff --git a/lava/group-iot-tpl.yaml b/lava/group-iot-tpl.yaml
deleted file mode 100644
index 8dc72e840f066fd7a64f5a7ab9a57390c692cc92..0000000000000000000000000000000000000000
--- a/lava/group-iot-tpl.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-job_name: {{image_name}}-{{group}}
-{% if device_type == 'qemu' %}
-{% include 'common-qemu-boot-tpl.yaml' %}
-{% else %}
-{% include 'common-boot-tpl.yaml' %}
-{% endif %}
-
- - test:
- timeout:
- minutes: 180
- namespace: system
- name: {{group}}-tests
- definitions:
-{%- for test_name in tests %}
- - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
- branch: 'apertis/v2023'
- history: False
- from: git
- name: {{test_name}}
- path: test-cases/{{test_name}}.yaml
- params:
- DIGITAL_TWIN_API_ADDRESS: {{ '{{ job.DIGITAL_TWIN_API_ADDRESS }}' }}
- DIGITAL_TWIN_API_USER: {{ '{{ job.DIGITAL_TWIN_API_USER }}' }}
- DIGITAL_TWIN_API_PASSWORD: {{ '{{ job.DIGITAL_TWIN_API_PASSWORD }}' }}
- TENANT: {{ '{{ job.TENANT }}' }}
- C2E_DEVICE_ID: {{ '{{ job.C2E_DEVICE_ID }}' }}
- C2E_DEVICE_PASSWORD: {{ '{{ job.C2E_DEVICE_PASSWORD }}' }}
-{%- endfor -%}
diff --git a/test-cases/iot-suite-connector.yaml b/test-cases/iot-suite-connector.yaml
deleted file mode 100644
index 06cd72b440071ae292bedfbe9ce47c139459637b..0000000000000000000000000000000000000000
--- a/test-cases/iot-suite-connector.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-metadata:
- name: iot-suite-connector
- format: "Apertis Test Definition 1.0"
- image-types:
- iot: [ amd64-internal, arm64-internal, armhf-internal ]
- image-deployment:
- - APT
- group: "iot"
- type: functional
- exec-type: automated
- priority: medium
- maintainer: "Apertis Project"
- description: "Ensure suite-connector can interact with cloud2edge."
-
- expected:
- - "If PASSED is displayed, the test has passed. The output should be
- similar to:"
- - |
- >--- PASS: TestConnectorSuite (10.29s)
- --- PASS: TestConnectorSuite/TestCommand (0.74s)
- --- PASS: TestConnectorSuite/TestConnectionStatus (0.51s)
- --- PASS: TestConnectorSuite/TestEvent (5.32s)
- --- PASS: TestConnectorSuite/TestTelemetry (3.01s)
- PASS
-
-install:
- git-repos:
- - url: https://gitlab.apertis.org/tests/suite-connector.git
- branch: 'apertis/v2023'
-
-run:
- steps:
- - "# Enter test directory:"
- - cd suite-connector
- - "# Execute the following command:"
- - >
- common/run-test-in-systemd --user=user --basename --
- env
- DIGITAL_TWIN_API_ADDRESS=$DIGITAL_TWIN_API_ADDRESS
- DIGITAL_TWIN_API_USER=$DIGITAL_TWIN_API_USER
- DIGITAL_TWIN_API_PASSWORD=$DIGITAL_TWIN_API_PASSWORD
- TENANT=$TENANT
- C2E_DEVICE_ID=$C2E_DEVICE_ID
- C2E_DEVICE_PASSWORD=$C2E_DEVICE_PASSWORD
- ./suite-connector.sh