home

commit fe01dcbe2c881bb7c4c796d4f93b1e176b9ce9cd
parent d0cd4b103a079d3768fab797270f5328af676cf3
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu, 12 May 2022 13:06:01 +0200

systems/aomi: fix osp nightly build

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

Diffstat:
M
systems/hosts/aomi.nix
 | 
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/systems/hosts/aomi.nix b/systems/hosts/aomi.nix
@@ -199,16 +199,21 @@ in
     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