Merge remote-tracking branch 'gh-hiddenalpha/master'

7 files changed, 71 insertions, 38 deletions

diff --git a/doc/note/aws/aws.txt b/doc/note/aws/aws.txt
index b3d0767..ee6b033 100644
--- a/doc/note/aws/aws.txt
+++ b/doc/note/aws/aws.txt
@@ -15,12 +15,12 @@ See "../kubernetes/kubectl.txt"
 ## How to get logs from super-fancy-UI
 
 [Kubernetes Inventory](https://wikit.post.ch/x/wSk0Ow)
-- dann "Mobility Services"
+- "Mobility Services" -> "Argo CD"
 - dann "houston" (entweder alle via hauptnode, oder instance via unten)
 - dann irgendwo auf logs
 
 
-## Houston Logs Tail follow
+## Houston Logs CLI
 
   argocd --server "https://deployment-eks-prod-m15cp0001.eks.aws.pnetcloud.ch/applications/argocd" app list
 
@@ -30,6 +30,8 @@ See "../kubernetes/kubectl.txt"
 
   kubectl -n "${NAMESPACE?}" exec -ti houston-0 -- sh -c 'cd /usr/local/vertx/logs && tail -F houston.log | egrep -v '\''( Forwarder | INFO ClusterWatchdogVerticle |  at io|^ *["}]| HttpMultiGetServer | BisectClient )'\'''
 
+  kubectl -n "${NAMESPACE?}" exec -ti houston-0 -- sh -c 'cd /usr/local/vertx/logs && tar cz *log*' > houston-"${stage:?}"-0-log-$(date -u +%Y%m%d-%H%M%SZ).tgz
+
 
 ## Houston auto chunk logs dload
 
diff --git a/doc/note/git/git.txt b/doc/note/git/git.txt
index f86fce1..a4e8e26 100644
--- a/doc/note/git/git.txt
+++ b/doc/note/git/git.txt
@@ -33,6 +33,19 @@ twice with colon in between):
   git fetch origin --depth=1 refs/tags/v1.2.3:refs/tags/v1.2.3
 
 
+## Auto-destroy code-format
+
+  && REMOTENAME=upstream \
+  && BRANCH= \
+  && ISSUENR= \
+  && if test -n "$(git status --porcelain)"; then echo "working tree not clean" && false; fi \
+  && git detach \
+  && mvn spotless:apply \
+  && git add -- . && git commit -m "[${ISSUENR:?}] Auto-destroy code-format" \
+  && git l2 \
+  && printf '\nTODO git br %s HEAD\n\n' "${BRANCH:?}" \
+  && printf '\nTODO git push %s HEAD:%s\n\n' "${REMOTENAME:?}" "HEAD:${BRANCH:?}" \
+
 
 ## Reduce local disk usage
 
diff --git a/doc/note/links/links.txt b/doc/note/links/links.txt
index 00480a2..e964b12 100644
--- a/doc/note/links/links.txt
+++ b/doc/note/links/links.txt
@@ -169,7 +169,6 @@ Links (Aka argument amplifiers)
 - [static final java uppercase](https://gitit.post.ch/projects/ISA/repos/preflux/pull-requests/82/overview?commentId=39126)
 - [invalid java class name](https://gitit.post.ch/projects/ISA/repos/preflux/pull-requests/82/overview?commentId=39125)
 - [spotless produces crap](https://gitit.post.ch/projects/ISA/repos/poodoo/pull-requests/40/overview?commentId=263122)
-- [spotless produces crap](https://gitit.post.ch/projects/ISA/repos/minetti/pull-requests/14/overview)
 - [spotless produces crap](https://gitit.post.ch/projects/ISA/repos/veet/pull-requests/2/overview?commentId=233638)
 - [spotless produces crap](https://gitit.post.ch/projects/ISA/repos/trin/pull-requests/79)
 - [spotless produces crap](https://gitit.post.ch/projects/ISA/repos/houston/pull-requests/449/overview?commentId=263593)
diff --git a/doc/note/setup/paisa-zwp-devEnv.txt b/doc/note/setup/paisa-zwp-devEnv.txt
index f1c79b8..46739e1 100644
--- a/doc/note/setup/paisa-zwp-devEnv.txt
+++ b/doc/note/setup/paisa-zwp-devEnv.txt
@@ -4,18 +4,22 @@ Environment for Zarniwoop development
 
 TODO: "Quartus Prime 16 Lite" required, but no longer available via intel dload
       page. Need some solution here.
+      Half-done kludge for quartus dot-run stuff not working, due to "CPU too old".
+      TRY: Maybe try to dload the pure archives and extract manually.
 
   && (set -e \
   && DIO_VERSION="054897-060542" \
   && DIO_ZIP="d-${DIO_VERSION:?}.zip" \
   && DIO_URL="https://wikit.post.ch/download/attachments/613505757/${DIO_ZIP:?}?api=v2" \
+  && QUARTUS_URL="https://cdrdv2.intel.com/v1/dl/getContent/825277/825299?filename=qinst-lite-linux-23.1std.1-993.run" \
+  && QUARTUS_RUN="${QUARTUS_URL##*filename=}" \
   && SUDO=sudo \
   && WORKDIR=/home/$USER/zarniwoop-workspace \
   && CACHEDIR=/var/tmp \
   && $SUDO apt install -y --no-install-recommends openssh-server vim make curl git unzip \
   && cd "${CACHEDIR:?}" \
-  && echo H4sIAAAAAAAAA1XLOw4CMQwA0Z5TUCMtsuNffBw7jiU6ak7PChqoZppX4NEUaLOw2Vfw6JRg8UXW6tdbHSA83c644by/Hs8Lp23PziU+AjcHdcKmjbjFJ8av0nPGRwGanmRkdSlsKTItcBQgjCL8U+b6VW9H4D67ogAAAA== | base64 -d | gunzip > MD5SUM \
-  && curl -Lo "${DIO_ZIP:?}" "${DIO_URL:?}" \
+  && echo H4sIAMfN1WYAA1XLQQoCMQyF4b2ncC20JE3bNMdJmxYGZFBnBsTTW8SFbt7/Np+B6CBFLoYjStMYRk0akzTikeV8MQcpFuEZYSz+tdxOsXKXOmpLEhR7VBoVOnXEnqSg/qo8T/goQM6ThGrDMvRkxNlAMAGhGuGfYslfxXG0YgFSJZ6EFBpI46DAxjzVfVm33V2Xvc9Zj6cL5HHbzaMTIf841tMbjUzVLOcAAAA= | base64 -d | gunzip > MD5SUM \
+  && curl -Lo "${CACHEDIR:?}/${DIO_ZIP:?}" "${DIO_URL:?}" \
   && grep "${DIO_VERSION:?}" MD5SUM | md5sum -c - \
   && mkdir -p "${WORKDIR:?}" \
   && cd "${WORKDIR:?}" \
@@ -24,7 +28,15 @@ TODO: "Quartus Prime 16 Lite" required, but no longer available via intel dload
   && cd "d-${DIO_VERSION:?}/devel" \
   && rm -rf app \
   && git clone https://gitit.post.ch/scm/isa/zarniwoop.git app \
-  && cd app \
+  && cd /tmp \
+  && curl -Lo "${CACHEDIR:?}/${QUARTUS_RUN:?}" "${QUARTUS_URL:?}" \
+  && grep -E "lite.*23" MD5SUM | md5sum -c - \
+  && mkdir "${CACHEDIR:?}/quartus-inst" \
+  && (cd "${CACHEDIR:?}" && sh "${QUARTUS_RUN:?}" --target "quartus-inst" --noexec) \
+  && (cd "${CACHEDIR:?}/quartus-inst" && sh qinst.sh --cli) \
   && printf '\n  Zarniwoop setup complete (TODO install compiler etc)\n\n' \
   && true) \
 
+
+[maybe helpful for quartus install](https://community.intel.com/t5/Nios-V-II-Embedded-Design-Suite/Nios-V-Processor-Installation-and-Hello-World-Execution-Part-1/m-p/1552554)
+
diff --git a/src/main/paisa-nonslim/patches/magician.patch b/src/main/paisa-nonslim/patches/magician.patch
index c688e83..b9dc52a 100644
--- a/src/main/paisa-nonslim/patches/magician.patch
+++ b/src/main/paisa-nonslim/patches/magician.patch
@@ -12,37 +12,20 @@
              vehicleInstance: [
                  services: [
                      eagle:    [version: '02.01.26.01-PR-379-SNAPSHOT'],
--                    platform: [version: '03.06.39.01-PR-388-SNAPSHOT'],
+-                    platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
 +                    platform: [version: '${j21.platform.version}'],
                      storage:  [version: '00.24.00.00'],
                      magician: [version: '%currentBranch%']
                  ]
 
 
---- a/magician-process/pom.xml
-+++ b/magician-process/pom.xml
-@@ -43,4 +43,9 @@
-             <artifactId>system-diagnostics-api</artifactId>
-         </dependency>
-+
-+        <dependency>
-+            <groupId>commons-fileupload</groupId>
-+            <artifactId>commons-fileupload</artifactId>
-+        </dependency>
-     </dependencies>
- 
-
-
 --- a/pom.xml
 +++ b/pom.xml
-@@ -42,5 +42,6 @@
-         <font-awesome.version>5.9.0</font-awesome.version>
-         <google-http-client.version>1.23.0</google-http-client.version>
+@@ -44,2 +44,3 @@
+         <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
 +        <common-fileupload.version>1.5</common-fileupload.version>
-         <jersey.version>2.27</jersey.version>
-         <javax.ws.rs-api.version>2.1</javax.ws.rs-api.version>
      </properties>
-@@ -89,4 +90,10 @@
+@@ -94,3 +95,9 @@
              </dependency>
  
 +            <dependency>
@@ -52,9 +35,16 @@
 +            </dependency>
 +
              <!-- Testing -->
-             <dependency>
-
 
 
+--- a/magician-process/pom.xml
++++ b/magician-process/pom.xml
+@@ -49,2 +49,6 @@
+         </dependency>
++        <dependency>
++            <groupId>commons-fileupload</groupId>
++            <artifactId>commons-fileupload</artifactId>
++        </dependency>
+     </dependencies>
 
 
diff --git a/src/main/paisa-nonslim/patches/trillian.patch b/src/main/paisa-nonslim/patches/trillian.patch
index b8106fe..6495c22 100644
--- a/src/main/paisa-nonslim/patches/trillian.patch
+++ b/src/main/paisa-nonslim/patches/trillian.patch
@@ -11,21 +11,30 @@
          .runKarma()
          .buildDocker()
          .withInstances([instances: [
-@@ -20,44 +20,44 @@
+
+
+--- a/Jenkinsfile
++++ b/Jenkinsfile
+@@ -20,7 +20,7 @@
              backend: [
                  services: [
                      houston:  [version: '02.01.68.01-PR-519-SNAPSHOT'],
--                    platform: [version: '03.06.40.01-java-21-support-trillian-SNAPSHOT'],
+-                    platform: [version: '03.06.40.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']
                  ]
              ],
+
+
+--- a/Jenkinsfile
++++ b/Jenkinsfile
+@@ -28,12 +28,12 @@
              vehicle1: [
                  services: [
                      eagle:     [version: '02.01.26.01-PR-379-SNAPSHOT'],
--                    platform:  [version: '03.06.40.01-java-21-support-trillian-SNAPSHOT'],
+-                    platform:  [version: '03.06.40.01-PR-388-SNAPSHOT'],
 +                    platform:  [version: '${j21.platform.version}'],
                      storage:   [version: '00.24.00.00'],
                      trillian:  [version: '%currentBranch%'],
@@ -37,10 +46,15 @@
                  ],
                  houstonInstance: 'backend'
              ],
+
+
+--- a/Jenkinsfile
++++ b/Jenkinsfile
+@@ -40,12 +40,12 @@
              vehicle2: [
                  services: [
                      eagle:     [version: '02.01.26.01-PR-379-SNAPSHOT'],
--                    platform:  [version: '03.06.40.01-java-21-support-trillian-SNAPSHOT'],
+-                    platform:  [version: '03.06.40.01-PR-388-SNAPSHOT'],
 +                    platform:  [version: '${j21.platform.version}'],
                      storage:   [version: '00.24.00.00'],
                      trillian:  [version: '%currentBranch%'],
@@ -52,10 +66,15 @@
                  ],
                  houstonInstance: 'backend'
              ],
+
+
+--- a/Jenkinsfile
++++ b/Jenkinsfile
+@@ -52,12 +52,12 @@
              vehicle3: [
                  services: [
                      eagle:     [version: '02.01.26.01-PR-379-SNAPSHOT'],
--                    platform:  [version: '03.06.40.01-java-21-support-trillian-SNAPSHOT'],
+-                    platform:  [version: '03.06.40.01-PR-388-SNAPSHOT'],
 +                    platform:  [version: '${j21.platform.version}'],
                      storage:   [version: '00.24.00.00'],
                      trillian:  [version: '%currentBranch%'],
diff --git a/src/main/patch/preflux/default.patch b/src/main/patch/preflux/default.patch
index 897d731..c52f653 100644
--- a/src/main/patch/preflux/default.patch
+++ b/src/main/patch/preflux/default.patch
@@ -4,10 +4,9 @@
 
 --- a/pom.xml
 +++ b/pom.xml
-@@ -57,6 +57,24 @@
- 
+@@ -58,4 +58,22 @@
      <!-- atlas -->
-     <atlas.version>00.01.00.00</atlas.version>
+     <atlas.version>00.01.01.00</atlas.version>
 +    <skip.angular.build>true</skip.angular.build>
 +    <skip.frontend.sourceformat.check>true</skip.frontend.sourceformat.check>
 +    <skip.grunt.build>true</skip.grunt.build>
@@ -28,7 +27,6 @@
 +    <skip.web.npm.install>true</skip.web.npm.install>
    </properties>
  
-   <modules>
 
 
 --- a/preflux-web/pom.xml