Development: Decouple LocalCI and LocalVC (#7787)

ls1intum · Dec 17, 2023 · f9198cd · f9198cd
1 parent e9d9e6a
commit f9198cd
Show file tree

Hide file tree

Showing 8 changed files with 255 additions and 365 deletions.
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIConnectorService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIConnectorService.java
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java
@@ -1,13 +1,9 @@
 package de.tum.in.www1.artemis.service.connectors.localci;
 
-import java.util.List;
-
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
-import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
-import de.tum.in.www1.artemis.domain.enumeration.ProjectType;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.exception.LocalCIException;
 import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService;
@@ -21,12 +17,8 @@ public class LocalCITriggerService implements ContinuousIntegrationTriggerServic
 
     private final LocalCISharedBuildJobQueueService localCISharedBuildJobQueueService;
 
-    private final LocalCIProgrammingLanguageFeatureService localCIProgrammingLanguageFeatureService;
-
-    public LocalCITriggerService(LocalCISharedBuildJobQueueService localCISharedBuildJobQueueService,
-            LocalCIProgrammingLanguageFeatureService localCIProgrammingLanguageFeatureService) {
+    public LocalCITriggerService(LocalCISharedBuildJobQueueService localCISharedBuildJobQueueService) {
         this.localCISharedBuildJobQueueService = localCISharedBuildJobQueueService;
-        this.localCIProgrammingLanguageFeatureService = localCIProgrammingLanguageFeatureService;
     }
 
     /**
@@ -49,22 +41,14 @@ public void triggerBuild(ProgrammingExerciseParticipation participation) throws
      */
     @Override
     public void triggerBuild(ProgrammingExerciseParticipation participation, String commitHash, boolean isPushToTestRepository) throws LocalCIException {
-
         ProgrammingExercise programmingExercise = participation.getProgrammingExercise();
-        ProgrammingLanguage programmingLanguage = programmingExercise.getProgrammingLanguage();
-        ProjectType projectType = programmingExercise.getProjectType();
         long courseId = programmingExercise.getCourseViaExerciseGroupOrCourseMember().getId();
 
-        List<ProjectType> supportedProjectTypes = localCIProgrammingLanguageFeatureService.getProgrammingLanguageFeatures(programmingLanguage).projectTypes();
-
-        if (projectType != null && !supportedProjectTypes.contains(programmingExercise.getProjectType())) {
-            throw new LocalCIException("The project type " + programmingExercise.getProjectType() + " is not supported by the local CI.");
-        }
-
         // Exam exercises have a higher priority than normal exercises
         int priority = programmingExercise.isExamExercise() ? 1 : 2;
 
         localCISharedBuildJobQueueService.addBuildJob(participation.getBuildPlanId(), participation.getId(), commitHash, System.currentTimeMillis(), priority, courseId,
                 isPushToTestRepository);
     }
+
 }