Skip to content

Commit

Permalink
[KOGITO-9434] Moving python modules under python profile (#3091)
Browse files Browse the repository at this point in the history
* [KOGITO-9434] Moving python modules under python profile

* [KOGITO-9434] Renaming to full from python

* [KOGITO-9434] Adding activation properties

* [KOGITO-9434] Installing numpy and jep through maven

* [KOGITO-9434] Update executor tests
  • Loading branch information
fjtirado authored Jul 27, 2023
1 parent 09a2673 commit e36f05b
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 4 deletions.
1 change: 1 addition & 0 deletions .ci/jenkins/Jenkinsfile.deploy
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ pipeline {
dir(getRepoName()) {
String mvnCmd = getMavenCommand()
.withProperty('maven.test.failure.ignore', true)
.withProfiles(['full'])
.skipTests(params.SKIP_TESTS)
.getFullRunCommand('clean install')
util.runWithPythonVirtualEnv(mvnCmd, 'swf')
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/Jenkinsfile.sonarcloud
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pipeline {
steps {
script {
util.runWithPythonVirtualEnv(getMavenCommand()
.withProfiles(['run-code-coverage'])
.withProfiles(['run-code-coverage', 'full'])
.getFullRunCommand('clean install'),
'swf')
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,30 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>pip-install</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>pip</executable>
<arguments>
<argument>install</argument>
<argument>-r</argument>
<argument>${project.basedir}/requirements.txt</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
numpy>=1.21.0
jep>=4.1.1
14 changes: 12 additions & 2 deletions kogito-serverless-workflow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,21 @@
</property>
</activation>
<modules>
<module>kogito-serverless-workflow-python-runtime</module>
<module>kogito-serverless-workflow-executor</module>
<module>kogito-serverless-workflow-executor-python</module>
<module>kogito-serverless-workflow-executor-tests</module>
</modules>
</profile>
<profile>
<id>full</id>
<activation>
<property>
<name>full</name>
</property>
</activation>
<modules>
<module>kogito-serverless-workflow-python-runtime</module>
<module>kogito-serverless-workflow-executor-python</module>
</modules>
</profile>
</profiles>
</project>
12 changes: 11 additions & 1 deletion quarkus/addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,19 @@
<module>task-management</module>
<module>marshallers</module>
<module>process-definitions</module>
<module>python</module>
</modules>
</profile>
<profile>
<id>full</id>
<activation>
<property>
<name>full</name>
</property>
</activation>
<modules>
<module>python</module>
</modules>
</profile>
</profiles>

<build>
Expand Down
21 changes: 21 additions & 0 deletions quarkus/addons/python/integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,27 @@
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>pip-install</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>pip</executable>
<arguments>
<argument>install</argument>
<argument>-r</argument>
<argument>${project.basedir}/requirements.txt</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 2 additions & 0 deletions quarkus/addons/python/integration-tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
numpy>=1.21.0
jep>=4.1.1

0 comments on commit e36f05b

Please sign in to comment.