Test removing test env

NamseEnt · Dec 4, 2023 · 32842a2 · 32842a2
1 parent 6b6b91f
commit 32842a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/oioi-agent-image-push.yml b/.github/workflows/oioi-agent-image-push.yml
@@ -172,4 +172,4 @@ jobs:
             exit 1
           fi
 
-          aws cloudformation delete-stack --stack-name $STACK_NAME
+          # aws cloudformation delete-stack --stack-name $STACK_NAME
diff --git a/oioi/cdk/lib/index.ts b/oioi/cdk/lib/index.ts
@@ -47,23 +47,23 @@ export class Oioi extends Construct {
                 },
             );
 
+        const logRemovalPolicy = props.logRemovalPolicy ?? cdk.RemovalPolicy.DESTROY;
+        const logRetention = props.logRetention ?? cdk.aws_logs.RetentionDays.ONE_WEEK;
+
         const systemMessagesLogGroup = new cdk.aws_logs.LogGroup(
             this,
             "SystemMessagesLogGroup",
             {
                 logGroupName: `/oioi/${props.groupName}/system_messages-${stackUuid}`,
-                retention:
-                    props.logRetention ?? cdk.aws_logs.RetentionDays.ONE_WEEK,
-                removalPolicy:
-                    props.logRemovalPolicy ?? cdk.RemovalPolicy.RETAIN,
+                retention: logRetention,
+                removalPolicy: logRemovalPolicy,
             },
         );
 
         const agentLogGroup = new cdk.aws_logs.LogGroup(this, "AgentLogGroup", {
             logGroupName: `/oioi/${props.groupName}/agent-${stackUuid}`,
-            retention:
-                props.logRetention ?? cdk.aws_logs.RetentionDays.ONE_WEEK,
-            removalPolicy: props.logRemovalPolicy ?? cdk.RemovalPolicy.RETAIN,
+            retention: logRetention,
+            removalPolicy: logRemovalPolicy,
         });
 
         const imageUri = (() => {

diff --git a/oioi/oioi-test-cdk/lib/oioi-test-cdk-stack.ts b/oioi/oioi-test-cdk/lib/oioi-test-cdk-stack.ts
@@ -11,6 +11,7 @@ export class OioiTestCdkStack extends cdk.Stack {
             file: "sample.Dockerfile",
             platform: cdk.aws_ecr_assets.Platform.LINUX_ARM64,
             outputs: ["type=docker"],
+
         });
 
         const { vpc, autoScalingGroup, alb } = new oioi.Oioi(this, "Oioi", {
@@ -106,11 +107,11 @@ def handler(event, context):
         const now = new Date();
         const minutes = now.getMinutes();
 
-        const minus5Minutes = (60 + (minutes - 5)) % 60;
+        const plus30Minutes = (60 + (minutes + 30)) % 60;
 
         new cdk.aws_events.Rule(this, "Rule", {
             schedule: cdk.aws_events.Schedule.cron({
-                minute: minus5Minutes.toString(),
+                minute: plus30Minutes.toString(),
                 hour: "*",
             }),
             targets: [new cdk.aws_events_targets.LambdaFunction(lambda)],