Commit fe01dcbe2c88

Vincent Demeester <vincent@sbr.pm>
2022-05-12 13:06:01
systems/aomi: fix osp nightly build
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent d0cd4b1
Changed files (1)
systems
hosts
aomi.nix
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