diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80f9269b89..be9cfad106 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,7 @@ publish_smoketest_runner: smoketest_play: stage: smoketest_play + resource_group: playground dependencies: - publish_smoketest_runner - publish_deployer @@ -65,6 +66,7 @@ smoketest_play: smoketest_staging: stage: smoketest_staging + resource_group: staging dependencies: - publish_smoketest_runner - publish_deployer diff --git a/automated_detection_testing/requirements.txt b/automated_detection_testing/requirements.txt index 3f6951af15..20a9903175 100644 --- a/automated_detection_testing/requirements.txt +++ b/automated_detection_testing/requirements.txt @@ -5,13 +5,6 @@ aspy.yaml==1.3.0 atomicwrites==1.4.0 attackcti==0.3.4.3 attrs==20.3.0 -azure-common==1.1.26 -azure-core==1.12.0 -azure-identity==1.5.0 -azure-mgmt-compute==19.0.0 -azure-mgmt-core==1.2.2 -azure-mgmt-network==18.0.0 -azure-mgmt-resource==16.0.0 bcrypt==3.2.0 boto3==1.17.30 botocore==1.20.30 @@ -41,8 +34,6 @@ mysql-connector-python==8.0.23 nodeenv==1.3.4 ntlm-auth==1.5.0 packaging==20.9 -packer.py==0.3.0 -paramiko==2.7.2 path==15.1.2 path.py==12.5.0 pexpect==4.8.0 diff --git a/bin/ssa-end-to-end-testing/k8s-deployer/k8s/components/smoketest.jsonnet b/bin/ssa-end-to-end-testing/k8s-deployer/k8s/components/smoketest.jsonnet index 190c39c013..38185080a2 100644 --- a/bin/ssa-end-to-end-testing/k8s-deployer/k8s/components/smoketest.jsonnet +++ b/bin/ssa-end-to-end-testing/k8s-deployer/k8s/components/smoketest.jsonnet @@ -13,7 +13,7 @@ local job = { }, }, spec: { - activeDeadlineSeconds: 600, + activeDeadlineSeconds: 1800, ttlSecondsAfterFinished: 100, template: { metadata: {