update ci

Author: ttunglee

.github/workflows/integration_omnibus.yml

@@ -171,7 +171,7 @@ jobs:
             compiler: gcc-12
             run: ./tests/ci/integration/run_sslproxy_integration.sh
           - name: sslproxy
-            arch: aarch64 
+            arch: aarch64
             size: large
             image: ubuntu:22.04
             compiler: gcc-12
@@ -257,9 +257,9 @@ jobs:
             run: ./tests/ci/integration/run_openldap_integration.sh OPENLDAP_REL_ENG_2_5
 
           # Cyrus SASL Integration Tests
-          - name: cyrus-sasl 
+          - name: cyrus-sasl
             arch: x86_64
-            size: small 
+            size: small
             image: ubuntu:22.04
             compiler: gcc-12
             run: ./tests/ci/integration/run_cyrus_sasl_integration.sh
@@ -279,7 +279,7 @@ jobs:
             compiler: gcc-12
             accp_fips: true
             run: ./tests/ci/integration/run_accp_integration.sh
-        
+
           # NMAP Integration Tests
           - name: nmap
             arch: x86_64
@@ -303,7 +303,7 @@ jobs:
             image: ubuntu:22.04
             compiler: gcc-12
             run: ./tests/ci/integration/run_libwebsockets_integration.sh
-          
+
           # GRPC Integration Tests
           - name: grpc
             arch: x86_64
@@ -321,7 +321,9 @@ jobs:
             compiler: gcc-12
             ipv6: true
             options: --privileged
-            run: ./tests/ci/integration/run_bind9_integration.sh
+            run: |
+              python3 -m pip install --upgrade meson
+              ./tests/ci/integration/run_bind9_integration.sh
 
           # strongSwan Integration Tests
           - name: strongswan

tests/ci/cdk/pipeline/ci_stage.py

@@ -94,22 +94,6 @@ def add_stage_to_pipeline(
 
         env = env or {}
 
-        prebuild_check_step = pipelines.CodeBuildStep(
-            "PrebuildCheck",
-            input=input,
-            commands=[
-                "cd tests/ci/cdk/pipeline/scripts",
-                'trigger_conditions=$(./check_trigger_conditions.sh --build-type ci --stacks "${STACKS}")',
-                r"export NEED_REBUILD=$(echo $trigger_conditions | sed -n 's/.*\(NEED_REBUILD=[0-9]*\).*/\1/p' | cut -d'=' -f2 )",
-            ],
-            env={
-                **env,
-                "STACKS": " ".join(stack_names),
-            },
-            role=role,
-            timeout=Duration.minutes(60),
-        )
-
         batch_timeout = max([stack.timeout for stack in self.stacks]) * (max_retry + 1)
         batch_build_jobs = {
             "build-list": [
@@ -142,14 +126,11 @@ def add_stage_to_pipeline(
             env={
                 **env,
                 "MAX_RETRY": max_retry,
-                "NEED_REBUILD": prebuild_check_step.exported_variable("NEED_REBUILD"),
             },
         )
 
-        ci_run_step.add_step_dependency(prebuild_check_step)
-
         pipeline.add_stage(
             self,
             pre=[private_repo_sync_step] if private_repo_sync_step else None,
-            post=[prebuild_check_step, ci_run_step],
+            post=[ci_run_step],
         )

tests/ci/cdk/pipeline/pipeline_stack.py

@@ -195,45 +195,6 @@ def __init__(
             targets=[targets.CodePipeline(pipeline=base_pipeline)],
         )
 
-        # Pipeline is run everytime we push to main branch. Avoid unnecessary hold up if these updates are non-CI related
-        if not IS_DEV:
-            start_index = next(
-                (i for i, stage in enumerate(base_pipeline.stages) if stage.stage_name == "PromoteToProduction"),
-                None
-            )
-
-            override_condition = {
-                "Conditions": [
-                    {
-                        "Result": "SKIP",
-                        "Rules": [
-                            {
-                                "Name": "Skip_Prod_Deployment",
-                                "RuleTypeId": {
-                                    "Category": "Rule",
-                                    "Owner": "AWS",
-                                    "Provider": "VariableCheck",
-                                    "Version": "1"
-                                },
-                                "Configuration": {
-                                    "Variable": "#{[email protected]_REBUILD}",
-                                    "Value": "0",
-                                    "Operator": "NE"
-                                },
-                            }
-                        ]
-                    }
-                ]
-            }
-
-            l1_pipeline = base_pipeline.node.default_child
-
-            for i in range(start_index, int(base_pipeline.stage_count)):
-                l1_pipeline.add_override(
-                    f"Properties.Stages.{i}.BeforeEntry",
-                    override_condition
-                )
-
     def deploy_to_environment(
         self,
         deploy_environment_type: DeployEnvironmentType,
@@ -305,58 +266,6 @@ def deploy_to_environment(
                                               deploy_environment=deploy_environment)
         pipeline.add_stage(gh_actions_stage)
 
-        docker_build_wave = pipeline.add_wave(
-            f"{deploy_environment_type.value}-DockerImageBuild"
-        )
-
-        linux_stage = LinuxDockerImageBuildStage(
-            self,
-            f"{deploy_environment_type.value}-LinuxDockerImageBuild",
-            pipeline_environment=pipeline_environment,
-            deploy_environment=deploy_environment,
-        )
-
-        linux_stage.add_stage_to_wave(
-            wave=docker_build_wave,
-            input=source.primary_output,
-            role=cross_account_role,
-            additional_stacks=setup_stage.stacks,
-            max_retry=MAX_TEST_RETRY,
-            env=codebuild_environment_variables,
-        )
-
-        windows_stage = WindowsDockerImageBuildStage(
-            self,
-            f"{deploy_environment_type.value}-WindowsDockerImageBuild",
-            pipeline_environment=pipeline_environment,
-            deploy_environment=deploy_environment,
-        )
-
-        windows_stage.add_stage_to_wave(
-            wave=docker_build_wave,
-            input=source.primary_output,
-            role=cross_account_role,
-            additional_stacks=setup_stage.stacks,
-            max_retry=MAX_TEST_RETRY,
-            env=codebuild_environment_variables,
-        )
-
-        docker_build_wave.add_post(
-            CodeBuildStep(
-                f"{deploy_environment_type.value}-FinalizeImages",
-                input=source,
-                commands=[
-                    "cd tests/ci/cdk/pipeline/scripts",
-                    './finalize_images.sh --repos "${ECR_REPOS}"',
-                ],
-                env={
-                    **codebuild_environment_variables,
-                    "ECR_REPOS": f"{' '.join(linux_stage.ecr_repo_names)} {' '.join(windows_stage.ecr_repo_names)}",
-                },
-                role=cross_account_role,
-            )
-        )
-
         ci_stage = CiStage(
             self,
             f"{deploy_environment_type.value}-CiTests",
@@ -371,6 +280,5 @@ def deploy_to_environment(
             max_retry=MAX_TEST_RETRY,
             env={
                 **codebuild_environment_variables,
-                "PREVIOUS_REBUILDS": f"{linux_stage.need_rebuild} {linux_stage.need_rebuild}",
             },
         )

tests/ci/integration/run_httpd_integration.sh

@@ -105,7 +105,7 @@ function setup_python_env() {
   python3 -m venv venv
   source venv/bin/activate
   python3 -m pip install --upgrade pip
-  python3 -m pip install pyopenssl websockets pytest filelock python-multipart
+  python3 -m pip install pyopenssl websockets "pytest<7.0" filelock python-multipart
 }
 
 function httpd_run_tests() {

tool-openssl/test_util.cc

@@ -13,7 +13,10 @@ void CreateAndSignX509Certificate(bssl::UniquePtr<X509> &x509,
   }
 
   // Set version to X509v3
-  X509_set_version(x509.get(), X509_VERSION_3);
+  if (!X509_set_version(x509.get(), X509_VERSION_3)) {
+    fprintf(stderr, "Error setting certificate version\n");
+    return;
+  }
 
   // Set validity period for 30 days
   if (!X509_gmtime_adj(X509_getm_notBefore(x509.get()), 0) ||