automatic commit at releng box

mc36 · Dec 30, 2024 · 548ead6 · 548ead6
1 parent 7cc2e61
commit 548ead6
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 6 deletions.
diff --git a/misc/image/ca.sh b/misc/image/ca.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 cd ../../src
-for a in amd64 arm64 arm32hf mips64 ppc64el risc64 s390x loong sparc sh4 ; do
+for a in amd64 i686 arm64 arm32hf mips64 ppc64el risc64 s390x loong sparc sh4 ; do
   java -Xmx256m -jar rtr.jar test image ../misc/image/plat.$a ../misc/image/image.jvm
   done
diff --git a/misc/image/image.jvm b/misc/image/image.jvm
@@ -35,6 +35,7 @@ exec cp rtr.jar %tmp%/rtr/
 select-lst
 select-sum
 package-down
+package-xtra
 package-inst
 
 find-file %tmp%/usr/lib/jvm/ java-[0-9]+-openjdk-%arch%

diff --git a/misc/image/image.nat b/misc/image/image.nat
@@ -10,6 +10,7 @@ exec cp rtr.bin %tmp%/rtr/
 select-lst
 select-sum
 package-down
+package-xtra
 package-inst
 
 include ../misc/image/image.end

diff --git a/misc/image/plat.i686 b/misc/image/plat.i686
@@ -5,4 +5,5 @@ kern 686-pae
 grub efi-ia32-bin
 boot i386-efi
 uefi bootia32.efi
+xtra linux-image-686-pae.udeb
 image ../binImg/rtr-i686
diff --git a/src/org/freertr/user/userImage.java b/src/org/freertr/user/userImage.java
@@ -57,6 +57,8 @@ public userImage() {
 
     private String uefi = "bootx64.efi";
 
+    private String xtra = "";
+
     private boolean depends = true;
 
     private tabGen<userImageCat> catalogs = new tabGen<userImageCat>();
@@ -348,14 +350,32 @@ private boolean downAllFiles() {
         return false;
     }
 
+    private boolean instOneFile(String name) {
+        return execCmd("dpkg-deb --fsys-tarfile " + name + " | tar -x --keep-directory-symlink -C " + tempDir + "/") != 0;
+    }
+
     private boolean instOneFile(userImagePkg pkg) {
         String name = getPackageName(pkg);
         if (pkg.done) {
             pip.linePut("skipping " + name);
             return false;
         }
         pkg.done = true;
-        return execCmd("dpkg-deb --fsys-tarfile " + name + " | tar -x --keep-directory-symlink -C " + tempDir + "/") != 0;
+        return instOneFile(name);
+    }
+
+    private boolean instXtraFiles() {
+        cmds cmd = new cmds("pkg", xtra);
+        for (;;) {
+            String a = cmd.word();
+            if (a.length() < 1) {
+                break;
+            }
+            if (instOneFile(downDir + "/" + arch + "-" + a)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private boolean instAllFiles() {
@@ -487,6 +507,10 @@ private boolean doOneFile(List<String> res) {
                 uefi = s;
                 continue;
             }
+            if (a.equals("xtra")) {
+                xtra = s;
+                continue;
+            }
             if (a.equals("temp")) {
                 tempDir = s;
                 continue;
@@ -658,6 +682,12 @@ private boolean doOneFile(List<String> res) {
                 }
                 continue;
             }
+            if (a.equals("package-xtra")) {
+                if (instXtraFiles()) {
+                    return true;
+                }
+                continue;
+            }
             if (a.equals("del-ifdn")) {
                 if (downMode == 1) {
                     delFiles(s);

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v24.12.30-cur, done by sprscc13@mrn0b0dy.
--;-;-;2024-12-30 07:41:27, took 00:14:44, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 retries
+-;-;-;2024-12-30 08:15:03, took 00:14:30, with 50 workers, on 3602 cases, 0 failed, 0 traces, 1 retries
 -;-;-;./rtr.bin
 http://sources.freertr.org/cfg/basic01.tst;basic01.tst;success;dummy test
 http://sources.freertr.org/cfg/basic02.tst;basic02.tst;success;interface with slot

diff --git a/src/rtr.html b/src/rtr.html
@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v24.12.30-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2024-12-30 07:41:27, took 00:14:44, with 50 workers, on 3602 cases, 0 failed, 0 traces, 2 retries<br/>
+tested: 2024-12-30 08:15:03, took 00:14:30, with 50 workers, on 3602 cases, 0 failed, 0 traces, 1 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>

diff --git a/src/rtr8.csv b/src/rtr8.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v24.12.30-cur, done by sprscc13@mrn0b0dy.
--;-;-;2024-12-30 07:51:29, took 00:09:40, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
+-;-;-;2024-12-30 08:28:37, took 00:13:12, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
 -;-;-;./rtr.bin
 http://sources.freertr.org/cfg/p4lang-acl001.tst;p4lang-acl001.tst;success;p4lang: copp
 http://sources.freertr.org/cfg/p4lang-acl002.tst;p4lang-acl002.tst;success;p4lang: ingress access list

diff --git a/src/rtr8.html b/src/rtr8.html
@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v24.12.30-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2024-12-30 07:51:29, took 00:09:40, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2024-12-30 08:28:37, took 00:13:12, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>