diff --git a/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 b/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 index 255b63a0c57a845c4be1d28fee6e66a6ca75ec52..b45251e25472faf31a352035522d6a8ff8146a95 100644 --- a/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 +++ b/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 @@ -3,11 +3,18 @@ # # SPDX-License-Identifier: MIT --- + +{% set should_run = ('nightly' in FREQUENCY or 'weekly' in FREQUENCY or 'all' in FORCE_TESTS or 'ptest' in FORCE_TESTS.split(',')) %} + device_type: mps3 job_name: {{ CI_JOB_NAME }} timeouts: job: - minutes: 300 +{% if should_run %} + minutes: 360 +{% else %} + minutes: 270 +{% endif %} metadata: source: {{ CI_PROJECT_URL }} @@ -150,7 +157,11 @@ actions: - test: namespace: secondary_media timeout: +{% if should_run %} minutes: 75 +{% else %} + minutes: 15 +{% endif %} definitions: - repository: metadata: @@ -163,7 +174,12 @@ actions: - functional run: steps: - - lava-test-case cassini-integration-tests --shell "ptest-runner - t 3600" + - lava-test-case cassini-integration-tests --shell "sudo -HEnu test ptest-runner -t 180 user-accounts-integration-tests" + - lava-test-case cassini-integration-tests --shell "sudo -HEnu test ptest-runner -t 180 container-engine-integration-tests" + - lava-test-case cassini-integration-tests --shell "sudo -HEnu test ptest-runner -t 180 k3s-integration-tests" +{% if should_run %} + - lava-test-case cassini-integration-tests --shell "sudo -HEnu test ptest-runner -t 1800 parsec-simple-e2e-tests" +{% endif %} - jfrog-cli config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --password={{ ARTIFACTORY_PASS }}; - | cat << EOF > ./upload_spec.json diff --git a/.gitlab/lava/n1sdp/ptest.yml.j2 b/.gitlab/lava/n1sdp/ptest.yml.j2 index 6f666c994989d91d7f1b2e1dcdac75f2bfa252c3..ad9b42b56abe10d17fbfcf28c3aeed2505d70062 100644 --- a/.gitlab/lava/n1sdp/ptest.yml.j2 +++ b/.gitlab/lava/n1sdp/ptest.yml.j2 @@ -3,11 +3,18 @@ # # SPDX-License-Identifier: MIT --- + +{% set should_run = ('nightly' in FREQUENCY or 'weekly' in FREQUENCY or 'all' in FORCE_TESTS or 'ptest' in FORCE_TESTS.split(',')) %} + device_type: n1sdp job_name: {{ CI_JOB_NAME }} timeouts: job: - minutes: 90 +{% if should_run %} + minutes: 130 +{% else %} + minutes: 80 +{% endif %} priority: medium visibility: group: @@ -162,10 +169,10 @@ actions: - boot: namespace: secondary_media timeout: - minutes: 15 + minutes: 10 method: minimal auto_login: - login_prompt: '(.*)login:' + login_prompt: 'n1sdp login:.*' username: cassini login_commands: - cassini123 @@ -174,7 +181,8 @@ actions: prompts: - 'New password: ' - 'Re-enter new password: ' - - '(.*)n1sdp:' + - '@n1sdp:.+\$ ' + - '@n1sdp:.+# ' transfer_overlay: download_command: wget -S unpack_command: tar -C / -xzf @@ -182,7 +190,11 @@ actions: - test: namespace: secondary_media timeout: - minutes: 30 +{% if should_run %} + minutes: 45 +{% else %} + minutes: 15 +{% endif %} definitions: - repository: metadata: @@ -195,7 +207,12 @@ actions: - functional run: steps: - - lava-test-case cassini-integration-tests --shell "ptest-runner -t 1800" + - lava-test-case cassini-integration-tests --shell "sudo -HEnu test ptest-runner -t 180 user-accounts-integration-tests" + - lava-test-case cassini-integration-tests --shell "sudo -HEnu test ptest-runner -t 180 container-engine-integration-tests" + - lava-test-case cassini-integration-tests --shell "sudo -HEnu test ptest-runner -t 180 k3s-integration-tests" +{% if should_run %} + - lava-test-case cassini-integration-tests --shell "sudo -HEnu test ptest-runner -t 1800 parsec-simple-e2e-tests" +{% endif %} - jfrog-cli config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --password={{ ARTIFACTORY_PASS }}; - | cat << EOF > ./upload_spec.json diff --git a/.gitlab/lava/n1sdp/sanity_job.yml.j2 b/.gitlab/lava/n1sdp/sanity_job.yml.j2 index d409b6922796cf4fec6791d74d40e331105c6e66..ffee45b86474fbdca54c5a1583622c80bbe9f75e 100644 --- a/.gitlab/lava/n1sdp/sanity_job.yml.j2 +++ b/.gitlab/lava/n1sdp/sanity_job.yml.j2 @@ -162,10 +162,10 @@ actions: - boot: namespace: secondary_media timeout: - minutes: 15 + minutes: 10 method: minimal auto_login: - login_prompt: '(.*)login:' + login_prompt: 'n1sdp login:.*' username: cassini login_commands: - cassini123 @@ -173,7 +173,8 @@ actions: prompts: - 'New password: ' - 'Re-enter new password: ' - - '(.*)n1sdp:' + - '@n1sdp:.+\$ ' + - '@n1sdp:.+# ' transfer_overlay: download_command: wget -S unpack_command: tar -C / -xzf diff --git a/meta-cassini-tests/recipes-tests/bats/bats_%.bbappend b/meta-cassini-tests/recipes-tests/bats/bats_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..1f21cb83e14212841549e76365c53cb0a48add63 --- /dev/null +++ b/meta-cassini-tests/recipes-tests/bats/bats_%.bbappend @@ -0,0 +1,7 @@ +# Copyright (c) 2023 Arm Limited and/or its affiliates. +# +# +# SPDX-License-Identifier: MIT + +inherit features_check +REQUIRED_DISTRO_FEATURES = "cassini-test" diff --git a/meta-cassini-tests/recipes-tests/bats/bats_1.6.1.bb b/meta-cassini-tests/recipes-tests/bats/bats_1.6.1.bb deleted file mode 100644 index ae0a8bd230cc003c436836828d68108f28fd30b7..0000000000000000000000000000000000000000 --- a/meta-cassini-tests/recipes-tests/bats/bats_1.6.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -# Based on: https://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-test/bats/bats_1.6.0.bb?id=76d8e526eae9fc9ab14ff5804ae0091230a8b39e -# In open-source project: https://git.openembedded.org/meta-openembedded -# -# Original file: Copyright (c) 2022 wangmy -# Modifications: Copyright (c) 2022 Arm Limited and Contributors. All rights reserved. -# -# SPDX-License-Identifier: MIT - -SUMMARY = "Bash Automated Testing System" -DESCRIPTION = "Bats is a TAP-compliant testing framework for Bash. It \ -provides a simple way to verify that the UNIX programs you write behave as expected." -AUTHOR = "Sam Stephenson & bats-core organization" -HOMEPAGE = "https://github.com/bats-core/bats-core" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" - -SRC_URI = "git://github.com/bats-core/bats-core.git;branch=version/1.6.x;protocol=https" -# v1.6.1 -SRCREV = "1977254c2a7faa2e0af17355856f91dc471d1daa" - -S = "${WORKDIR}/git" - -do_configure:prepend() { - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-file - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-test -} - -do_install() { - # Just a bunch of bash scripts to install - ${S}/install.sh ${D}${prefix} ${baselib} -} - -RDEPENDS:${PN} = "bash" -FILES:${PN} += "${libdir}/bats-core/*" - -PACKAGECONFIG ??= "pretty" -PACKAGECONFIG[pretty] = ",,,ncurses" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "cassini-test" diff --git a/meta-cassini-tests/recipes-tests/runtime-integration-tests/files/run-test-suite b/meta-cassini-tests/recipes-tests/runtime-integration-tests/files/run-test-suite index 8579453a19a2c663ad33914413eedc50a80f2c14..47194eddb7b1ff681aaaac1ee31acfdd7f920110 100644 --- a/meta-cassini-tests/recipes-tests/runtime-integration-tests/files/run-test-suite +++ b/meta-cassini-tests/recipes-tests/runtime-integration-tests/files/run-test-suite @@ -1,6 +1,7 @@ #!/usr/bin/env bash # -# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. +# Copyright (c) 2022-2023 Arm Limited and/or its affiliates. +# # # SPDX-License-Identifier: MIT @@ -13,7 +14,7 @@ if ! cd /home ; then exit 1 fi -if sudo -HEnu "${CASSINI_TEST_ACCOUNT}" bats "${CASSINI_TEST_BATS_OPTIONS}" "${TEST_DIR}/${TEST_SUITE_NAME}.bats"; then +if bats "${CASSINI_TEST_BATS_OPTIONS}" "${TEST_DIR}/${TEST_SUITE_NAME}.bats"; then echo "PASS:${TEST_SUITE_NAME}" exit 0 else