try 1

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

images/cdi-importer/werf.inc.yaml

@@ -59,7 +59,7 @@ import:
 - image: packages/binaries/nbdkit
   add: /nbdkit
   to: /nbdkit
-  before: setup
+  before: install
 shell:
   install:
     {{- include "alt packages proxy" . | nindent 2 }}

images/dvcr-artifact/werf.inc.yaml

@@ -35,7 +35,7 @@ shell:
 {{- define "$name" -}}
 binaries:
 - /usr/local/bin/dvcr-importer
-- /usr/bin/nbd*
+- /usr/sbin/nbd*
 - /usr/bin/file
 - /usr/share/misc/magic.mgc
 - /usr/local/bin/dvcr-uploader

images/edk2/werf.inc.yaml

@@ -71,7 +71,8 @@ shell:
     git clone $(cat /run/secrets/SOURCE_REPO)/tianocore/edk2-platforms.git
 
     cd {{ $gitRepoName }}-{{ $version }}
-  {{- if ne "$(cat /run/secrets/SOURCE_REPO)" "https://github.com"}}
+  {{- if ne "$(cat /run/secrets/SOURCE_REPO)" "https://github.com" }}
+    echo "Change submodule url"
     git submodule set-url -- CryptoPkg/Library/OpensslLib/openssl $(cat /run/secrets/SOURCE_REPO)/openssl/openssl
     git submodule set-url -- UnitTestFrameworkPkg/Library/CmockaLib/cmocka $(cat /run/secrets/SOURCE_REPO)/tianocore/edk2-cmocka.git
     git submodule set-url -- MdeModulePkg/Universal/RegularExpressionDxe/oniguruma $(cat /run/secrets/SOURCE_REPO)/kkos/oniguruma.git

images/libvirt/werf.inc.yaml

@@ -141,6 +141,10 @@ shell:
     git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} {{ $gitRepoName }}-{{ $version }}
 
     cd {{ $gitRepoName }}-{{ $version }}
+  {{- if ne "$(cat /run/secrets/SOURCE_REPO)" "https://github.com" }}
+    echo "Change submodule url"
+    git submodule set-url -- subprojects/keycodemapdb $(cat /run/secrets/SOURCE_REPO)/keycodemap/keycodemapdb.git
+  {{- end }}
 
     for p in /patches/*.patch ; do
       echo -n "Apply ${p} ... "

images/virt-launcher/werf.inc.yaml

@@ -455,27 +455,27 @@ git:
       - '**/*'
 shell:
   install:
-      {{- include "debian packages proxy" . | nindent 2 }}
-    - |
-      echo "install deps libvirt-dev"
-      apt-get update && apt-get install -y libvirt-dev
-      apt-get clean
-    - mkdir -p /binaries
-    - |
-      echo "Build node-labeller binaries"
-      cd /node-labeller
-      echo '== go build -ldflags="-s -w" -o /binaries/node-labeller ./cmd/node-labeller =='
-      go build -ldflags="-s -w" -o /binaries/node-labeller ./cmd/node-labeller
-      echo "Done"
-    - |
-      cd /src-vlctl
-      export GO111MODULE=on
-      export GOOS=linux
-      export CGO_ENABLED=0
-      export GOARCH=amd64
-      echo '== go build -ldflags="-s -w" -o /binaries/vlctl ./cmd/vlctl/main.go =='
-      go build -ldflags="-s -w" -o /binaries/vlctl ./cmd/vlctl/main.go
-      echo "Done"
+  {{- include "debian packages proxy" . | nindent 2 }}
+  - |
+    echo "install deps libvirt-dev"
+    apt-get update && apt-get install -y libvirt-dev
+    apt-get clean
+  - mkdir -p /binaries
+  - |
+    echo "Build node-labeller binaries"
+    cd /node-labeller
+    echo '== go build -ldflags="-s -w" -o /binaries/node-labeller ./cmd/node-labeller =='
+    go build -ldflags="-s -w" -o /binaries/node-labeller ./cmd/node-labeller
+    echo "Done"
+  - |
+    cd /src-vlctl
+    export GO111MODULE=on
+    export GOOS=linux
+    export CGO_ENABLED=0
+    export GOARCH=amd64
+    echo '== go build -ldflags="-s -w" -o /binaries/vlctl ./cmd/vlctl/main.go =='
+    go build -ldflags="-s -w" -o /binaries/vlctl ./cmd/vlctl/main.go
+    echo "Done"
 ---
 image: {{ $.ImageName }}-cbuilder
 final: false
@@ -488,7 +488,7 @@ git:
         - '*.c'
 shell:
   beforeInstall:
-    {{- include "debian packages proxy" . | nindent 2 }}
+  {{- include "debian packages proxy" . | nindent 2 }}
   - |
     apt-get update && apt-get install --yes gcc musl-dev musl-tools
     apt-get clean