home

commit d3f1211879e938dce1fcec13eeac8cd5be12eb41
parent 85b095b2938e0b1943787eee1c9162e759434751
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu,  1 Sep 2022 15:16:44 +0200

systems/aomi: rewrite/fix osp nightly build

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/hosts/aomi.nix
 | 
34
+++++++++++++++-------------------

1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/systems/hosts/aomi.nix b/systems/hosts/aomi.nix
@@ -181,31 +181,27 @@ in
       OnFailure = "status-email-root@%.service";
     };
 
-    path = with pkgs; [ git openssh bash coreutils-full nix which ];
+    path = with pkgs; [ git openssh bash coreutils-full nix which gnumake ];
     script = ''
       set -e
       cd /home/vincent/src/osp/p12n/p12n
-      git clean -fd
-      git reset --hard HEAD
-      git checkout main
       git fetch -p --all
-      BRANCH=$(git symbolic-ref --short HEAD)
-      # 1.8
-      git clean -fd
-      git reset --hard HEAD
-      git checkout upstream/pipelines-1.8-rhel-8
-      nix-shell /home/vincent/src/osp/shell.nix --command 'make REMOTE=quay.io/vdemeest TAG=1.8 sources/upgrade sources/operator/fetch-payload  bundle/push'
-      # make REMOTE=quay.io/vdemeest TAG=1.8 sources/upgrade sources/operator/fetch-payload  bundle/push
-      git reset --hard HEAD
-      #1.7
       git clean -fd
       git reset --hard HEAD
-      git checkout upstream/pipelines-1.7-rhel-8
-      nix-shell /home/vincent/src/osp/shell.nix --command 'make REMOTE=quay.io/vdemeest TAG=1.7 sources/upgrade sources/operator/fetch-payload  bundle/push'
-      # make REMOTE=quay.io/vdemeest TAG=1.7 sources/upgrade sources/operator/fetch-payload  bundle/push
-      git reset --hard HEAD
-      # revert
-      git checkout $BRANCH
+      git checkout main
+      git rebase upstream/main
+      # Make versions
+      make versions
+      for v in 1.7 1.8 1.9; do
+        echo "Build $v"
+        (
+        cd versions/$v
+        git clean -fd
+        git reset --hard HEAD
+        git co upstream/pipelines-$v-rhel-8
+        nix-shell /home/vincent/src/osp/shell.nix --command 'make REMOTE=quay.io/vdemeest TAG=$v sources/upgrade sources/operator/fetch-payload  bundle/push'
+        )
+      done
     '';
 
     startAt = "daily";