Skip to content

Commit

Permalink
[CI] move Jenkins finn checkout into JenkinsFile
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnoel committed Oct 12, 2023
1 parent da30f6b commit b6a7b72
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 50 deletions.
49 changes: 0 additions & 49 deletions build/get-finn-dev.sh

This file was deleted.

20 changes: 19 additions & 1 deletion ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pipeline {
steps {
cleanLocalCloneDir()
dir('build') {
sh './get-finn-dev.sh'
getFinn()
// WORKAROUND - Jenkins is not an interactive shell, deselect '-it',
// in order to build bitstreams/run build script with Jenkins.
dir('finn') {
Expand Down Expand Up @@ -393,3 +393,21 @@ def checkAllBoards() {

return overallResult
}

void getFinn() {
// Using shell commands due to git plugin not behaving when cloning a new repo into
// an existing one. Likely a way to do this, but shell commands are sufficient

// Cleanup existing checkout
sh "rm -rf finn"

// Clone FINN repo into finn directory and checkout correct branch
sh "git clone https://github.com/Xilinx/finn finn"
sh "git -C finn checkout testing/jenkins-integration"

// WORKAROUND - Jenkins is not an interactive shell, deselect '-it',
// in order to build bitstreams/run build script with Jenkins.
dir('finn') {
sh "sed -i '/DOCKER_INTERACTIVE=\"-it\"/d' run-docker.sh"
}
}

0 comments on commit b6a7b72

Please sign in to comment.