From c7ad1f2edb2534fa4be0956284a6f636f9862667 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 20 Sep 2024 13:09:25 -0700 Subject: [PATCH] reset to working state --- .gitlab-ci.yml | 2 +- conftest.py | 7 ------- utils/_context/virtual_machines.py | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b866f3b02..3cade20779 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ onboarding_fedora_host: script: - ./build.sh -i runner - - timeout 2700s ./run.sh $SCENARIO --vm-weblog test-app-${TEST_LIBRARY} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws --vm-default-vms False + - timeout 2700s ./run.sh $SCENARIO --vm-weblog test-app-${TEST_LIBRARY} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws .onboarding_nodejs: extends: .base_job_onboarding_system_tests diff --git a/conftest.py b/conftest.py index 50d08e58ea..c3a13ab3c9 100644 --- a/conftest.py +++ b/conftest.py @@ -44,13 +44,6 @@ def pytest_addoption(parser): parser.addoption("--vm-provider", type=str, action="store", help="Set provider for VMs") parser.addoption("--vm-only-branch", type=str, action="store", help="Filter to execute only one vm branch") parser.addoption("--vm-skip-branches", type=str, action="store", help="Filter exclude vm branches") - parser.addoption( - "--vm-default-vms", - type=str, - action="store", - help="True launch vms marked as default, False launch only no default vm. All launch all vms", - default="True", - ) # Docker ssi scenarios parser.addoption("--ssi-weblog", type=str, action="store", help="Set docker ssi weblog") diff --git a/utils/_context/virtual_machines.py b/utils/_context/virtual_machines.py index b50839d746..7807eee0e5 100644 --- a/utils/_context/virtual_machines.py +++ b/utils/_context/virtual_machines.py @@ -336,7 +336,7 @@ class Fedora39amd64(_VirtualMachine): def __init__(sef, **kwargs) -> None: super().__init__( "Fedora_39_amd64", - aws_config=_AWSConfig(ami_id="ami-0ba8f2988373d0735", ami_instance_type="t2.medium", user="fedora"), + aws_config=_AWSConfig(ami_id="ami-0ee7ca65ea2e8c5d9", ami_instance_type="t2.medium", user="fedora"), vagrant_config=None, krunvm_config=None, os_type="linux",