diff --git a/.gitmodules b/.gitmodules index aff70fe..a8a9d9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "build-utils"] path = build-utils url = git+ssh://github.com/rbkmoney/build_utils +[submodule "build_utils"] + path = build_utils + url = git+ssh://github.com/rbkmoney/build_utils diff --git a/Jenkinsfile b/Jenkinsfile index dd68618..9323fc1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,10 +28,12 @@ def images_pipeline(String repoName, String agentLabel, Closure body) { } images_pipeline("images", 'docker-host') { - runStage('submodules') { - sh 'make submodules' + withCredentials( + [[$class: 'FileBinding', credentialsId: 'github-rbkmoney-ci-bot-file', variable: 'GITHUB_PRIVKEY']]) { + runStage('submodules') { + sh 'make submodules' + } } - runStage('stage3 download') { sh 'make .latest-stage3' } diff --git a/Makefile b/Makefile index cc43364..4623ba1 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ SUBMODULES = build-utils SUBTARGETS = $(patsubst %,%/.git,$(SUBMODULES)) $(SUBTARGETS): + GIT_SSH_COMMAND="$(shell which ssh) -o StrictHostKeyChecking=no -o User=git $(shell [ -n "${GITHUB_PRIVKEY}" ] && echo -o IdentityFile="${GITHUB_PRIVKEY}")" \ git submodule update --init $(basename $@) touch $@ diff --git a/build_utils b/build_utils new file mode 160000 index 0000000..e4adea6 --- /dev/null +++ b/build_utils @@ -0,0 +1 @@ +Subproject commit e4adea653c6ca5920e7a0a912db6b8b8bca5da37