From 3cdc7431adf806a0ed8b5d52713bb9dfd955c4e3 Mon Sep 17 00:00:00 2001 From: Stanislaw Kaushanski Date: Tue, 23 Jun 2020 18:24:55 +0200 Subject: [PATCH] =?UTF-8?q?=E2=80=9EJenkinsfile=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ed42022..5335d6c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,8 +46,8 @@ void build_hifive_without_scv() { try { sh("conan profile new default --detect --force") sh("conan profile update settings.compiler.libcxx=libstdc++11 default") - sh("conan remote add minres https://api.bintray.com/conan/minres/conan-repo") - sh("conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan") + sh("conan remote add minres https://api.bintray.com/conan/minres/conan-repo --force") + sh("conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force") } catch (exc) { echo 'Conan configured' @@ -72,7 +72,7 @@ pipeline { stages { stage('HiFive-VP pipeline') { parallel { - stage('ubuntu/18.04'){ + stage('ubuntu'){ agent {docker { image 'ubuntu-18.04' } } stages { stage('Checkout on Ubuntu') { @@ -87,7 +87,7 @@ pipeline { } } } - stage('Fedora/28'){ + stage('Fedora28'){ agent {docker { image 'fedora28' } } stages { stage('Checkout on Fedora') { @@ -102,7 +102,7 @@ pipeline { } } } - stage('Build without SCV'){ + stage('No SCV'){ agent {docker { image 'ubuntu-18.04' } } stages { stage('Checkout on Ubuntu') {