remove module runner

ppgia-unifor · Feb 27, 2024 · 2d637de · 2d637de
1 parent 67c1034
commit 2d637de
Show file tree

Hide file tree

Showing 26 changed files with 507 additions and 585 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -25,7 +25,7 @@ jobs:
     - name: Test with Maven
       run: | 
         kubectl cluster-info --context kind-chart-testing
-        mvn -B compile --file ./resilience-bench/pom.xml
+        mvn -B compile --file ./resilience-bench/operator/pom.xml
         find ./resilience-bench/operator/target/classes/META-INF/fabric8 -type f -name "*-v1.yml" | xargs -I {} kubectl apply -f {}
         kubectl get crd
-        mvn -B test --file ./resilience-bench/pom.xml
+        mvn -B test --file ./resilience-bench/operator/pom.xml
diff --git a/resilience-bench/Makefile b/resilience-bench/Makefile
@@ -1,7 +1,7 @@
 test:
-	mvn clean compile
+	mvn clean compile -B operator/pom.xml
 	find ./operator/target/classes/META-INF/fabric8 -type f -name "*-v1.yml" | xargs -I {} kubectl apply -f {}
-	mvn test
+	mvn test -B operator/pom.xml
 
 deploy:
 	find ./operator/target/classes/META-INF/fabric8 -type f -name "*-v1.yml" | xargs -I {} kubectl apply -f {}
@@ -10,4 +10,5 @@ deploy:
 clean:
 	@kubectl delete scenario --all --all-namespaces
 	@kubectl delete job --all --all-namespaces
-	@kubectl delete queues --all --all-namespaces
+	@kubectl delete queues --all --all-namespaces
+	@kubectl delete benchmark --all --all-namespaces
diff --git a/resilience-bench/operator/.idea/.gitignore b/resilience-bench/operator/.idea/.gitignore
diff --git a/resilience-bench/operator/.idea/compiler.xml b/resilience-bench/operator/.idea/compiler.xml
diff --git a/resilience-bench/operator/.idea/jarRepositories.xml b/resilience-bench/operator/.idea/jarRepositories.xml
diff --git a/resilience-bench/operator/.idea/jpa-buddy.xml b/resilience-bench/operator/.idea/jpa-buddy.xml
diff --git a/resilience-bench/operator/.idea/misc.xml b/resilience-bench/operator/.idea/misc.xml
diff --git a/resilience-bench/operator/.idea/vcs.xml b/resilience-bench/operator/.idea/vcs.xml
diff --git a/resilience-bench/operator/pom.xml b/resilience-bench/operator/pom.xml
@@ -4,20 +4,22 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>br.unifor.ppgia</groupId>
-        <artifactId>resilience-bench</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>operator</artifactId>
+    <groupId>br.unifor.ppgia</groupId>
+    <artifactId>resilience-bench-operator</artifactId>
     <version>1.0.0</version>
 
     <properties>
         <operator.version>4.8.0</operator.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
+        <fabric8-client.version>6.10.0</fabric8-client.version>
+        <junit.version>5.10.2</junit.version>
     </properties>
 
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -42,12 +44,24 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- fabric8 -->
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>istio-client</artifactId>
+            <version>${fabric8-client.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-httpclient-vertx</artifactId>
+            <version>${fabric8-client.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>crd-generator-apt</artifactId>
             <version>${fabric8-client.version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
@@ -65,6 +79,36 @@
             <artifactId>operator-framework-junit-5</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.10.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
@@ -84,6 +128,43 @@
                     </to>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*E2ETest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.12.1</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.2.5</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*E2ETest.java</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/...nce-bench/operator/src/main/java/br/unifor/ppgia/resiliencebench/BenchmarkReconciler.java b/...nce-bench/operator/src/main/java/br/unifor/ppgia/resiliencebench/BenchmarkReconciler.java
@@ -70,4 +70,6 @@ private void createOrUpdateScenario(Scenario scenario, CustomResourceRepository<
       logger.debug("Scenario already exists: {}", scenario.getMetadata().getName());
     }
   }
+
+
 }
-Original file line number
+Diff line change
@@ Expand Up @@
           logger.debug("Scenario already exists: {}", scenario.getMetadata().getName());
         }
       }
     }