summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fankhauser hiddenalpha.ch2024-09-24 15:59:52 +0200
committerAndreas Fankhauser hiddenalpha.ch2024-09-24 15:59:52 +0200
commit54a051e1f3f3cb56a0ea6d5c8439b81093ababeb (patch)
tree4995325f892c8c68186fc05f7d96ebfa93a3413e
parent4ba3f84e6e696f8ac0e543cc036b3a84263b4327 (diff)
downloadUnspecifiedGarbage-54a051e1f3f3cb56a0ea6d5c8439b81093ababeb.zip
UnspecifiedGarbage-54a051e1f3f3cb56a0ea6d5c8439b81093ababeb.tar.gz
PaisaNoSlim updates.
-rw-r--r--src/main/paisa-nonslim/README.txt6
-rw-r--r--src/main/paisa-nonslim/foo.js10
-rw-r--r--src/main/paisa-nonslim/patches/barman.patch24
-rw-r--r--src/main/paisa-nonslim/patches/blart.patch4
-rw-r--r--src/main/paisa-nonslim/patches/caveman.patch11
-rw-r--r--src/main/paisa-nonslim/patches/colin.patch13
-rw-r--r--src/main/paisa-nonslim/patches/drdan.patch13
-rw-r--r--src/main/paisa-nonslim/patches/jeltz.patch11
-rw-r--r--src/main/paisa-nonslim/patches/megacamel.patch4
-rw-r--r--src/main/paisa-nonslim/patches/minetti.patch17
-rw-r--r--src/main/paisa-nonslim/patches/platform.patch207
-rw-r--r--src/main/paisa-nonslim/patches/slarti.patch50
-rw-r--r--src/main/paisa-nonslim/patches/trillian.patch26
-rw-r--r--src/main/paisa-nonslim/patches/vogon.patch4
-rw-r--r--src/main/paisa-nonslim/patches/vroom.patch6
-rw-r--r--src/main/paisa/JenkinsReBuild.c92
16 files changed, 290 insertions, 208 deletions
diff --git a/src/main/paisa-nonslim/README.txt b/src/main/paisa-nonslim/README.txt
index 7ee49bd..bb7efb8 100644
--- a/src/main/paisa-nonslim/README.txt
+++ b/src/main/paisa-nonslim/README.txt
@@ -21,8 +21,8 @@ Evtl für diese services den jssc als "provided" angeben.
&& "${PATH_TO_THE_ONLY_REAL_BROWSER:?}" \
`# waiting for jenkins build ` \
- `# waiting for feedback from rudins ` \
https://jenkinspaisa-temp.tools.pnet.ch/job/colin/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
+ `# waiting for feedback from rudins ` \
`# LastSuccessfull build at 20240919 ` \
https://jenkinspaisa-temp.tools.pnet.ch/job/slarti/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
https://jenkinspaisa-temp.tools.pnet.ch/job/captain/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
@@ -65,9 +65,9 @@ Evtl für diese services den jssc als "provided" angeben.
https://jenkinspaisa-temp.tools.pnet.ch/job/platform/job/SDCISA-15648-RemoveSlimPackaging-n2/ \
- && for S in rob thor pobble colin nowwhat zem slarti captain megacamel guide allitnil babelfish barman benjy bentstick blart caveman deep drdan hooli jeltz kwaltz loon magician minetti mown poodoo prosser streetmentioner towel vannharl vogon vroom zaphake heimdall platform trillian deep;
+ && for S in allitnil babelfish barman benjy bentstick blart captain caveman colin deep drdan guide heimdall hooli jeltz kwaltz loon magician megacamel minetti mown nowwhat platform pobble poodoo prosser rob slarti streetmentioner thor towel trillian vannharl vogon vroom zaphake zem;
do \
- printf '%-20s%s\n' "$S" "$(/c/work/tmp/bin/JenkinsReBuild.exe --cookie "${COOKIE?}" --branch SDCISA-15648-RemoveSlimPackaging-n2 --service "$S" 2>&1)"; \
+ printf '%-17s%s\n' "$S" "$(/c/work/tmp/bin/JenkinsReBuild.exe --cookie "${COOKIE?}" --branch "${BRANCH:?}" --service "$S" 2>&1)"; \
done \
diff --git a/src/main/paisa-nonslim/foo.js b/src/main/paisa-nonslim/foo.js
index 8bc1ff3..6315035 100644
--- a/src/main/paisa-nonslim/foo.js
+++ b/src/main/paisa-nonslim/foo.js
@@ -268,10 +268,10 @@ Related:
/****** TryBuild early, because other depend on them ******/
//"platform",
- //"slarti", "captain", "megacamel", "guide",
+ //"captain", "guide", "megacamel", "slarti",
/****** "regular" builds ******/
//"allitnil", "babelfish", "barman", "benjy", "bentstick", "blart", "caveman", "colin",
- //"deep", "drdan", "heimdall", "hooli", "jeltz", "kwaltz", "loon", "magician",
+ //"drdan", "heimdall", "hooli", "jeltz", "kwaltz", "loon", "magician",
//"minetti", "mown", "nowwhat", "pobble", "poodoo", "prosser", "streetmentioner", "thor",
//"towel", "vannharl", "vogon", "vroom", "zaphake", "zem",
/****** Depends on 'slarti', 'captain' ******/
@@ -1216,10 +1216,10 @@ Related:
commitMsg: null,
versionPrefix: "0.0.0-U0RdSV", /* const part of generated seq above (MUST have for find version later) */
/* generate: {date +%N|md5sum -b -|base64|tr -d '/+='|head -c6 && echo} */
- platformSnapVersion: "pikAAO-SNAPSHOT",
- serviceSnapVersion: "pikAAO-SNAPSHOT",
+ platformSnapVersion: "OGJjMG-SNAPSHOT",
+ serviceSnapVersion: "OGJjMG-SNAPSHOT",
};
- app.branchName = app.issueKey +"-RemoveSlimPackaging-n2";
+ app.branchName = app.issueKey +"-RemoveSlimPackaging-n4";
app.commitMsg = "["+ app.issueKey +"] Remove slim packaging";
if( parseArgs(process.argv, app) !== 0 ){ process.exit(1); }
if( app.isHelp ){ printHelp(); return; }
diff --git a/src/main/paisa-nonslim/patches/barman.patch b/src/main/paisa-nonslim/patches/barman.patch
index f93ef4d..2ffb414 100644
--- a/src/main/paisa-nonslim/patches/barman.patch
+++ b/src/main/paisa-nonslim/patches/barman.patch
@@ -6,36 +6,20 @@
jslPipeline
.checkout()
.setBranchVersion()
-- .buildMaven()
-+ .buildMaven()
+- .buildMaven([spotless: false])
++ .buildMaven([spotless: false])
.runKarma()
.withInstances([
instances: [
@@ -20,7 +20,7 @@
testInstance: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
barman: [version: '%currentBranch%']
]
---- a/pom.xml
-+++ b/pom.xml
-@@ -86,6 +86,11 @@
- <artifactId>linti</artifactId>
- <version>${linti.version}</version>
- </dependency>
-+ <dependency>
-+ <groupId>org.glassfish</groupId>
-+ <artifactId>jakarta.el</artifactId>
-+ <version>4.0.2</version> <!-- TODO move this version somewhere else -->
-+ </dependency>
- </dependencies>
- </dependencyManagement>
-
-
-
diff --git a/src/main/paisa-nonslim/patches/blart.patch b/src/main/paisa-nonslim/patches/blart.patch
index 525c5e0..238d635 100644
--- a/src/main/paisa-nonslim/patches/blart.patch
+++ b/src/main/paisa-nonslim/patches/blart.patch
@@ -4,8 +4,8 @@
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,3 +17,3 @@ serviceBuildPipeline([
- eagle: [version: '02.01.19.00'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
diff --git a/src/main/paisa-nonslim/patches/caveman.patch b/src/main/paisa-nonslim/patches/caveman.patch
index 0d95dc0..14e02a6 100644
--- a/src/main/paisa-nonslim/patches/caveman.patch
+++ b/src/main/paisa-nonslim/patches/caveman.patch
@@ -2,7 +2,7 @@
--- a/Jenkinsfile
+++ b/Jenkinsfile
-@@ -10,13 +10,13 @@
+@@ -10,6 +10,6 @@
jslPipeline
.checkout()
.setBranchVersion()
@@ -10,10 +10,15 @@
+ .buildMaven([spotless: true])
.withInstances([
instances: [
+
+
+--- a/Jenkinsfile
++++ b/Jenkinsfile
+@@ -16,7 +16,7 @@
testInstance: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
caveman: [version: '%currentBranch%']
diff --git a/src/main/paisa-nonslim/patches/colin.patch b/src/main/paisa-nonslim/patches/colin.patch
new file mode 100644
index 0000000..e778c1f
--- /dev/null
+++ b/src/main/paisa-nonslim/patches/colin.patch
@@ -0,0 +1,13 @@
+
+--- a/Jenkinsfile
++++ b/Jenkinsfile
+@@ -37,7 +37,7 @@ serviceBuildPipeline([
+ guide: [version: '02.14.14.01-PR-122-SNAPSHOT'],
+ vogon: [version: '03.03.11.01-PR-72-SNAPSHOT'],
+ zem: [version: '04.00.15.01-PR-87-SNAPSHOT'],
+- slarti: [version: '03.15.18.01-PR-1019-SNAPSHOT']
++ slarti: [version: '${j21.slarti.mangledVersion}']
+ ],
+ houstonInstance: 'backendInstance'
+ ]
+
diff --git a/src/main/paisa-nonslim/patches/drdan.patch b/src/main/paisa-nonslim/patches/drdan.patch
index a60adb7..fa0c9e0 100644
--- a/src/main/paisa-nonslim/patches/drdan.patch
+++ b/src/main/paisa-nonslim/patches/drdan.patch
@@ -3,21 +3,22 @@
--- a/Jenkinsfile
+++ b/Jenkinsfile
-@@ -10,13 +10,13 @@
+@@ -10,6 +10,6 @@
jslPipeline
.checkout()
.setBranchVersion()
-- .buildMaven()
-+ .buildMaven()
+- .buildMaven([spotless: false])
++ .buildMaven([spotless: false])
.withInstances([
instances: [
+@@ -16,7 +16,7 @@
testInstance: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '0.0.0-SDCISA-15648-ed1d4665-SNAPSHOT'],
storage: [version: '00.24.00.00'],
drdan: [version: '%currentBranch%'],
- guide: [version: '02.14.13.01-PR-122-SNAPSHOT'],
+ guide: [version: '02.14.14.01-PR-122-SNAPSHOT'],
diff --git a/src/main/paisa-nonslim/patches/jeltz.patch b/src/main/paisa-nonslim/patches/jeltz.patch
index b09c1f3..d4db428 100644
--- a/src/main/paisa-nonslim/patches/jeltz.patch
+++ b/src/main/paisa-nonslim/patches/jeltz.patch
@@ -2,7 +2,7 @@
--- a/Jenkinsfile
+++ b/Jenkinsfile
-@@ -13,13 +13,13 @@
+@@ -13,6 +13,6 @@
jslPipeline
.checkout()
.setBranchVersion()
@@ -10,10 +10,15 @@
+ .buildMaven([spotless: true])
.withInstances([
instances: [
+
+
+--- a/Jenkinsfile
++++ b/Jenkinsfile
+@@ -19,7 +19,7 @@
vehicleInstance: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
jeltz: [version: '%currentBranch%']
diff --git a/src/main/paisa-nonslim/patches/megacamel.patch b/src/main/paisa-nonslim/patches/megacamel.patch
index 80d2add..0eb2ce7 100644
--- a/src/main/paisa-nonslim/patches/megacamel.patch
+++ b/src/main/paisa-nonslim/patches/megacamel.patch
@@ -8,8 +8,8 @@
jslPipeline
.checkout()
.setBranchVersion()
-- .buildMaven()
-+ .buildMaven()
+- .buildMaven([spotless: false])
++ .buildMaven([spotless: false])
.buildDocker()
.finalizeAndUpdateVersion()
.saveArtifacts()
diff --git a/src/main/paisa-nonslim/patches/minetti.patch b/src/main/paisa-nonslim/patches/minetti.patch
index c49fba1..8c2a2b1 100644
--- a/src/main/paisa-nonslim/patches/minetti.patch
+++ b/src/main/paisa-nonslim/patches/minetti.patch
@@ -12,27 +12,24 @@
.runKarma()
.withInstances([
instances: [
-@@ -20,16 +20,16 @@
+@@ -20,6 +20,6 @@
backendInstance: [
services: [
-- houston: [version: '02.01.66.01-PR-519-SNAPSHOT'],
-+ houston: [version: '02.01.76.00'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ houston: [version: '02.01.77.01-PR-519-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00']
]
- ],
+@@ -27,8 +27,8 @@
vehicleInstance: [
services: [
-- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-+ eagle: [version: '02.01.27.00'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
-- slarti: [version: '03.15.09.01-PR-1019-SNAPSHOT'],
+- slarti: [version: '03.15.18.01-PR-1019-SNAPSHOT'],
+ slarti: [version: '${j21.slarti.mangledVersion}'],
minetti: [version: '%currentBranch%']
],
- houstonInstance: 'backendInstance'
diff --git a/src/main/paisa-nonslim/patches/platform.patch b/src/main/paisa-nonslim/patches/platform.patch
index c142b4a..1257896 100644
--- a/src/main/paisa-nonslim/patches/platform.patch
+++ b/src/main/paisa-nonslim/patches/platform.patch
@@ -1,88 +1,135 @@
20240812 now based on the java-21 branch, no longer on develop.
+
+ Only here because patch file cannot be empty
+--- a/poms/service/paisa-service-superpom/pom.xml
++++ b/poms/service/paisa-service-superpom/pom.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+- <modelVersion>4.0.0</modelVersion>
++ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>paisa-superpom</artifactId>
+ <groupId>ch.post.it.paisa</groupId>
+
+
--- a/poms/service/paisa-service-superpom/pom.xml
+++ b/poms/service/paisa-service-superpom/pom.xml
-@@ -895,79 +895,11 @@
- <configuration>
- <properties>
- <!--
- Don't you DARE add slf4j here. If you do, the services in a
- constellation won't start up! So be mindful and DON'T add it.
- -->
- <slimArtifacts>
-- aopalliance:aopalliance<!--TODO: never directly used in platform-->
-- ch.post.it.paisa.alice:alice-service-config-core
-- ch.post.it.paisa.alice:alice-service-domain-core
-- ch.post.it.paisa.alice:alice-service-process-core
-- ch.post.it.paisa.alice:alice-service-logging-core
-- ch.post.it.paisa.alice:alice-service-web-core
-- org.aspectj:aspectjweaver<!--Transitively used by spring-aspects-->
-- org.aspectj:aspectjrt<!--TODO: never directly used in platform-->
-- com.fasterxml:classmate<!--Transitively used by hibernate-validator-->
-- ch.post.it.common.core:common-core-metadata
-- commons-codec:commons-codec
-- commons-collections:commons-collections
-- commons-fileupload:commons-fileupload
-- commons-io:commons-io
-- commons-lang:commons-lang
-- commons-logging:commons-logging
-- commons-logging:commons-logging-api
-- commons-logging:commons-logging-api:99.0-does-not-exist
-- io.micrometer:micrometer-observation<!--Transitively used by spring-web & spring-context-->
-- io.micrometer:micrometer-commons<!--Transitively used by micrometer-observation-->
-- net.sf.ehcache:ehcache-core
-- org.hibernate.validator:hibernate-validator
-- org.hibernate:hibernate-core-jakarta
-- org.apache.httpcomponents:httpclient
-- org.apache.httpcomponents:httpcore
-- org.apache.httpcomponents:httpmime
-- com.fasterxml.jackson.core:jackson-annotations
-- com.fasterxml.jackson.core:jackson-core
-- com.fasterxml.jackson.core:jackson-databind
-- com.fasterxml.jackson.datatype:jackson-datatype-jsr310<!--Transitively used by shedlock-->
-- org.glassfish:jakarta.el
-- jakarta.annotation:jakarta.annotation-api
-- com.sun.activation:jakarta.activation
-- javax.xml.bind:jaxb-api
-- com.sun.xml.bind:jaxb-core
-- com.sun.xml.bind:jaxb-impl
-- org.jboss.logging:jboss-logging<!--Transitively used by hibernate-validator-->
-- org.slf4j:jcl-over-slf4j<!--TODO: never directly used in platform-->
-- joda-time:joda-time
-- com.google.code.findbugs:jsr305
- io.github.java-native:jssc
-- org.slf4j:jul-to-slf4j<!--TODO: never used in platform-->
-- org.apache.logging.log4j:log4j-core
-- org.apache.logging.log4j:log4j-api
-- ch.post.it.paisa.api:common-logging-api
-- ch.post.it.paisa.api:common-server-api
-- ch.post.it.paisa.api:system-status-api
-- ch.post.it.paisa.api:common-metric-api
-- ch.post.it.paisa.api:user-registration-api
-- ch.post.it.paisa.api:vehiclelink-power-api
-- ch.post.it.paisa.api:shared-navigation-api
-- ch.post.it.paisa.api:navigation-location-api
-- ch.post.it.paisa.api:maintenance-observation-api
-- org.springframework:spring-aop<!--Transitively used by spring-webmvc-->
-- org.springframework:spring-aspects
-- org.springframework:spring-beans<!--Transitively used by spring-web-->
-- org.springframework:spring-context
-- org.springframework:spring-context-support
-- org.springframework:spring-core
-- org.springframework:spring-expression
-- org.springframework:spring-test
-- org.springframework:spring-web
-- org.springframework:spring-webmvc
-- jakarta.validation:jakarta.validation-api
-- net.javacrumbs.shedlock:shedlock-spring
-- net.javacrumbs.shedlock:shedlock-core
-- net.bull.javamelody:javamelody-core
-- org.jrobin:jrobin
-- com.thoughtworks.xstream:xstream
- </slimArtifacts>
- </properties>
- <source>
+@@ -271,6 +271,54 @@
+ <groupId>org.jfrog.buildinfo</groupId>
+ <artifactId>artifactory-maven-plugin</artifactId>
+ </plugin>
++
++ <plugin>
++ <groupId>org.codehaus.gmaven</groupId>
++ <artifactId>groovy-maven-plugin</artifactId>
++ <version>2.1.1</version>
++ <executions>
++ <execution>
++ <phase>prepare-package</phase>
++ <goals>
++ <goal>execute</goal>
++ </goals>
++ <configuration>
++ <properties>
++ <!--
++ Don't you DARE add slf4j here. If you do, the services in a
++ constellation won't start up! So be mindful and DON'T add it.
++ -->
++ <slimArtifacts>
++ io.github.java-native:jssc
++ </slimArtifacts>
++ </properties>
++ <source>
++ import java.nio.file.*
++
++ Path slimLibPath = Paths.get(project.build.directory + "/lib/");
++ slimLibPath.toFile().mkdirs();
++
++ def slimArtifacts = properties.slimArtifacts.split("\\s+");
++ println("Group:Artefacts to be SLIMmed: " + slimArtifacts)
++ project.artifacts.each { af -&gt;
++ def key = af.groupId + ":" + af.artifactId
++ printf("SLIMmed? %-70s", key)
++ if (slimArtifacts.contains(key)) {
++ println(" --&gt; yes (set scope to 'provided' and copy JAR to target/lib/)")
++ af.scope = "provided"
++ Path copyFrom = af.file.toPath();
++ Path copyTo = slimLibPath.resolve(af.file.name);
++ //println(copyFrom.toString() + " --&gt; " + copyTo.toString())
++ Files.copy(copyFrom, copyTo, StandardCopyOption.REPLACE_EXISTING);
++ } else {
++ println(" --&gt; no")
++ }
++ }
++ </source>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
+ </plugins>
+
+ <pluginManagement>
+
+--- a/poms/service/paisa-service-superpom/pom.xml
++++ b/poms/service/paisa-service-superpom/pom.xml
+@@ -882,53 +930,6 @@
+ <id>slim</id>
+ <build>
+ <plugins>
+- <plugin>
+- <groupId>org.codehaus.gmaven</groupId>
+- <artifactId>groovy-maven-plugin</artifactId>
+- <version>2.1.1</version>
+- <executions>
+- <execution>
+- <phase>prepare-package</phase>
+- <goals>
+- <goal>execute</goal>
+- </goals>
+- <configuration>
+- <properties>
+- <!--
+- Don't you DARE add slf4j here. If you do, the services in a
+- constellation won't start up! So be mindful and DON'T add it.
+- -->
+- <slimArtifacts>
+- io.github.java-native:jssc
+- </slimArtifacts>
+- </properties>
+- <source>
+- import java.nio.file.*
+-
+- Path slimLibPath = Paths.get(project.build.directory + "/lib/");
+- slimLibPath.toFile().mkdirs();
+-
+- def slimArtifacts = properties.slimArtifacts.split("\\s+");
+- println("Group:Artefacts to be SLIMmed: " + slimArtifacts)
+- project.artifacts.each { af -&gt;
+- def key = af.groupId + ":" + af.artifactId
+- printf("SLIMmed? %-70s", key)
+- if (slimArtifacts.contains(key)) {
+- println(" --&gt; yes (set scope to 'provided' and copy JAR to target/lib/)")
+- af.scope = "provided"
+- Path copyFrom = af.file.toPath();
+- Path copyTo = slimLibPath.resolve(af.file.name);
+- //println(copyFrom.toString() + " --&gt; " + copyTo.toString())
+- Files.copy(copyFrom, copyTo, StandardCopyOption.REPLACE_EXISTING);
+- } else {
+- println(" --&gt; no")
+- }
+- }
+- </source>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+ </plugins>
+ </build>
+ </profile>
diff --git a/src/main/paisa-nonslim/patches/slarti.patch b/src/main/paisa-nonslim/patches/slarti.patch
index 31e009f..2b23ef2 100644
--- a/src/main/paisa-nonslim/patches/slarti.patch
+++ b/src/main/paisa-nonslim/patches/slarti.patch
@@ -14,64 +14,38 @@
@@ -51,7 +51,7 @@
vehicleSel: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
slarti: [version: '%currentBranch%'],
- nowwhat: [version: '04.02.17.01-PR-123-SNAPSHOT'],
+ nowwhat: [version: '04.02.19.01-PR-123-SNAPSHOT'],
@@ -62,7 +62,7 @@
vehicleCucumber_1: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
slarti: [version: '%currentBranch%'],
- nowwhat: [version: '04.02.17.01-PR-123-SNAPSHOT'],
+ nowwhat: [version: '04.02.19.01-PR-123-SNAPSHOT'],
@@ -73,7 +73,7 @@
vehicleCucumber_take_out_service: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
slarti: [version: '%currentBranch%'],
- nowwhat: [version: '04.02.17.01-PR-123-SNAPSHOT'],
+ nowwhat: [version: '04.02.19.01-PR-123-SNAPSHOT'],
@@ -84,7 +84,7 @@
st_rest: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
slarti: [version: '%currentBranch%'],
- nowwhat: [version: '04.02.17.01-PR-123-SNAPSHOT'],
-
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -314,6 +314,21 @@
- <artifactId>moment-timezone</artifactId>
- <version>${webjars.moment-timezone.version}</version>
- </dependency>
-+ <dependency>
-+ <groupId>jakarta.servlet</groupId>
-+ <artifactId>jakarta.servlet-api</artifactId>
-+ <version>6.1.0</version> <!-- TODO move this version somewhere else -->
-+ </dependency>
-+ <dependency>
-+ <groupId>org.eclipse.jetty.ee10</groupId>
-+ <artifactId>jetty-ee10-webapp</artifactId>
-+ <version>12.0.12</version> <!-- TODO move this version somewhere else -->
-+ </dependency>
-+ <dependency>
-+ <groupId>org.awaitility</groupId>
-+ <artifactId>awaitility</artifactId>
-+ <version>4.2.2</version> <!-- TODO move this version somewhere else -->
-+ </dependency>
- </dependencies>
- </dependencyManagement>
- <build>
+ nowwhat: [version: '04.02.19.01-PR-123-SNAPSHOT'],
diff --git a/src/main/paisa-nonslim/patches/trillian.patch b/src/main/paisa-nonslim/patches/trillian.patch
index 6495c22..d0c4cd7 100644
--- a/src/main/paisa-nonslim/patches/trillian.patch
+++ b/src/main/paisa-nonslim/patches/trillian.patch
@@ -18,14 +18,12 @@
@@ -20,7 +20,7 @@
backend: [
services: [
- houston: [version: '02.01.68.01-PR-519-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ houston: [version: '02.01.77.01-PR-519-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
-- astra: [version: '04.00.11.01-PR-168-SNAPSHOT']
-+ astra: [version: '04.00.13.00']
+ astra: [version: '04.00.15.01-PR-168-SNAPSHOT']
]
- ],
--- a/Jenkinsfile
@@ -33,12 +31,12 @@
@@ -28,12 +28,12 @@
vehicle1: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
trillian: [version: '%currentBranch%'],
-- slarti: [version: '03.15.12.01-PR-1019-SNAPSHOT'],
+- slarti: [version: '03.15.18.01-PR-1019-SNAPSHOT'],
+ slarti: [version: '${j21.slarti.mangledVersion}'],
zaphake: [version: '03.00.22.01-PR-60-SNAPSHOT'],
- megacamel: [version: '03.00.15.01-PR-46-SNAPSHOT']
@@ -53,12 +51,12 @@
@@ -40,12 +40,12 @@
vehicle2: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
trillian: [version: '%currentBranch%'],
-- slarti: [version: '03.15.12.01-PR-1019-SNAPSHOT'],
+- slarti: [version: '03.15.18.01-PR-1019-SNAPSHOT'],
+ slarti: [version: '${j21.slarti.mangledVersion}'],
zaphake: [version: '03.00.22.01-PR-60-SNAPSHOT'],
- megacamel: [version: '03.00.15.01-PR-46-SNAPSHOT']
@@ -73,12 +71,12 @@
@@ -52,12 +52,12 @@
vehicle3: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
trillian: [version: '%currentBranch%'],
-- slarti: [version: '03.15.12.01-PR-1019-SNAPSHOT'],
+- slarti: [version: '03.15.18.01-PR-1019-SNAPSHOT'],
+ slarti: [version: '${j21.slarti.mangledVersion}'],
zaphake: [version: '03.00.22.01-PR-60-SNAPSHOT'],
- megacamel: [version: '03.00.15.01-PR-46-SNAPSHOT']
diff --git a/src/main/paisa-nonslim/patches/vogon.patch b/src/main/paisa-nonslim/patches/vogon.patch
index 59d631c..1241ed5 100644
--- a/src/main/paisa-nonslim/patches/vogon.patch
+++ b/src/main/paisa-nonslim/patches/vogon.patch
@@ -12,8 +12,8 @@
instances: [
testInstance: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
vogon: [version: '%currentBranch%']
diff --git a/src/main/paisa-nonslim/patches/vroom.patch b/src/main/paisa-nonslim/patches/vroom.patch
index 17b71ee..5c8f393 100644
--- a/src/main/paisa-nonslim/patches/vroom.patch
+++ b/src/main/paisa-nonslim/patches/vroom.patch
@@ -7,12 +7,12 @@
.setBranchVersion()
- .buildMaven([spotless: true])
+ .buildMaven([spotless: true])
- .withInstances([
+ .withEC2Instances([
instances: [
testInstance: [
services: [
- eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'],
-- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
+ eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'],
+- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'],
+ platform: [version: '${j21.platform.version}'],
storage: [version: '00.24.00.00'],
vroom: [version: '%currentBranch%']
diff --git a/src/main/paisa/JenkinsReBuild.c b/src/main/paisa/JenkinsReBuild.c
index 901b489..62418cb 100644
--- a/src/main/paisa/JenkinsReBuild.c
+++ b/src/main/paisa/JenkinsReBuild.c
@@ -123,8 +123,18 @@ verify:
}
-static void HttpReq_pushIoTask( void(*task)(void*arg), void*arg, void*app_ ){
- App*const app = assert_is_App(app_);
+#define Cls_mAGIC (signed)0x0E2C0000
+#define Cls struct { \
+ int mAGIC; \
+ App *app; \
+ void (*onDone)(char const*restrict,void*); \
+ void *onDoneArg; \
+}
+#define assert_is_Cls(p) assert(p && ((Cls*)p)->mAGIC == Cls_mAGIC)
+
+static void HttpReq_pushIoTask( void(*task)(void*arg), void*arg, void*cls_ ){
+ Cls*const cls = cls_; assert_is_Cls(cls_);
+ App*const app = assert_is_App(cls->app);
(*app->env)->enqueBlocking(app->env, task, arg);
}
@@ -137,11 +147,17 @@ static void HttpReq_onError( int retval, void*mentorCls ){
static void HttpReq_onRspHdr(
const char*proto, int proto_len, int rspCode, const char*phrase, int phrase_len,
const struct Garbage_HttpMsg_Hdr*hdrs, int hdrs_cnt,
- struct Garbage_HttpClientReq**req, void*app_
+ struct Garbage_HttpClientReq**req, void*cls_
){
- App*const app = assert_is_App(app_);
+ Cls*const cls = cls_; assert_is_Cls(cls_);
+ App*const app = assert_is_App(cls->app);
app->httpRspCode = rspCode;
- if( rspCode != 200 ){
+ if( rspCode == 200 ){
+ /*no debug output needed*/
+ }else if( rspCode == 401 || rspCode == 404 ){
+ /*short output is enough*/
+ LOGDBG("%.*s %d %.*s\n", proto_len, proto, rspCode, phrase_len, phrase);
+ }else{ /*unexpected, Log more*/
LOGDBG("%.*s %d %.*s\n", proto_len, proto, rspCode, phrase_len, phrase);
for( int i = 0 ; i < hdrs_cnt ; ++i ){
LOGDBG("%.*s: %.*s\n", hdrs[i].key_len, hdrs[i].key, hdrs[i].val_len, hdrs[i].val);
@@ -152,10 +168,11 @@ static void HttpReq_onRspHdr(
static void HttpReq_onRspBody(
- const char*buf, int buf_len, struct Garbage_HttpClientReq**req, void*app_
+ const char*buf, int buf_len, struct Garbage_HttpClientReq**req, void*cls_
){
- App*const app = assert_is_App(app_);
- if( app->httpRspCode != 200 ){
+ Cls*const cls = cls_; assert_is_Cls(cls_);
+ App*const app = assert_is_App(cls->app);
+ if( app->httpRspCode != 200 && app->httpRspCode != 404 ){
LOGDBG("%.*s", buf_len, buf);
return;
}
@@ -173,30 +190,55 @@ static void HttpReq_onRspBody(
}
-static void HttpReq_onRspDone( struct Garbage_HttpClientReq**req, void*app_ ){
- App*const app = assert_is_App(app_);
+static void HttpReq_onRspDone( struct Garbage_HttpClientReq**req, void*cls_ ){
+ Cls*const cls = cls_; assert_is_Cls(cls_);
+ App*const app = assert_is_App(cls->app);
if( app->flg & FLG_printRspBodyAnyway ){
LOGDBG("\n");/*fix broken server which deliver no LF at TEXT body end*/
}
+ if( app->httpRspCode == 404 ){
+ cls->onDone("ENOENT", cls->onDoneArg);
+ return;
+ }
+ if( app->httpRspCode != 200 ){
+ cls->onDone("ERROR", cls->onDoneArg);
+ return;
+ }
assert(app->rspBody != NULL);
+ int const isRunning = strstr(app->rspBody, "\"state\":\"running\"") != NULL;
int const isFail = strstr(app->rspBody, "\"state\":\"failure\"") != NULL;
- if( isFail ){
- LOGDBG("[DEBUG] Build has FAILED\n");
+ if( isRunning ){
+ cls->onDone("running", cls->onDoneArg);
+ }else if( isFail ){
+ cls->onDone("failure", cls->onDoneArg);
}else{
- LOGDBG("[DEBUG] Build has SUCCEEDED (likely)\n");
+ cls->onDone("OK", cls->onDoneArg);
}
}
-static void TlsClientMentor_pushIoTask( void(*task)(void*arg), void*arg, void*app_ ){ assert(!"TODO_4WgAAI8UAACIdQAA"); }
-static void TlsClientMentor_onError( int eno, void*app_ ){ assert(!"TODO_gxsAAMspAABkYgAA"); }
+static void TlsClientMentor_pushIoTask( void(*task)(void*arg), void*arg, void*cls_ ){ assert(!"TODO_4WgAAI8UAACIdQAA"); }
+static void TlsClientMentor_onError( int eno, void*cls_ ){ assert(!"TODO_gxsAAMspAABkYgAA"); }
-static void run( void*app_ ){
+/*
+ * @param onDone
+ * Called with one of: "running", "failure", "OK".
+ */
+static void TODO_refactorMeToAProperApi(
+ App*app_, void(*onDone)(char const*restrict state,void*arg), void*arg
+){
REGISTER int err;
App*const app = assert_is_App(app_);
static char const*const peerHostname = "jenkinspaisa-temp.tools.pnet.ch";
assert(app->tlsClient == NULL);
+ assert(onDone != NULL);
+ Cls *cls = malloc(1*sizeof*cls);
+ assert(cls != NULL);
+ cls->mAGIC = Cls_mAGIC;
+ cls->app = app;
+ cls->onDone = onDone;
+ cls->onDoneArg = arg;
static struct Garbage_TlsClient_Mentor tlsMentor = {
.pushIoTask = TlsClientMentor_pushIoTask,
.onError = TlsClientMentor_onError,
@@ -229,7 +271,7 @@ static void run( void*app_ ){
err = snprintf(it, SPACE, "/lastBuild/pipeline-graph/tree"); it += err; assert(err == 30);
#undef SPACE
//LOGDBG("[DEBUG] GET %s\n", url);
- req = (*app->env)->newHttpClientReq(app->env, &httpMentor, app,
+ req = (*app->env)->newHttpClientReq(app->env, &httpMentor, cls,
&(struct Garbage_HttpClientReq_Opts){
//.mallocator = NULL,
.socketMgr = (*app->tlsClient)->asSocketMgr(app->tlsClient),
@@ -246,6 +288,22 @@ static void run( void*app_ ){
(*req)->resume(req);
}
+#undef Cls_mAGIC
+#undef Cls
+#undef assert_is_Cls
+
+
+static void onBuildStatusAvailable( char const*buildStatus, void*app_ ){
+ (void)app_; //App*const app = assert_is_App(app_);
+ printf("%s\n", buildStatus);
+}
+
+
+static void run( void*app_ ){
+ App*const app = assert_is_App(app_);
+ TODO_refactorMeToAProperApi(app, onBuildStatusAvailable, app);
+}
+
int main( int argc, char**argv ){
#if _WIN32