diff --git a/jenkins-scripts/dsl/gazebo.dsl b/jenkins-scripts/dsl/gazebo.dsl index 6c77a25f5..201b1c3a9 100644 --- a/jenkins-scripts/dsl/gazebo.dsl +++ b/jenkins-scripts/dsl/gazebo.dsl @@ -97,20 +97,9 @@ abi_distro.each { distro -> steps { shell("""\ #!/bin/bash -xe - wget https://raw.githubusercontent.com/osrf/bash-yaml/master/yaml.sh -O yaml.sh - source yaml.sh - - if [[ -f \${WORKSPACE}/gazebo/bitbucket-pipelines.yml ]]; then - create_variables \${WORKSPACE}/gazebo/bitbucket-pipelines.yml - fi export DISTRO=${distro} - if [[ -n \${image} ]]; then - echo "Bitbucket pipeline.yml detected. Default DISTRO is ${distro}" - export DISTRO=\$(echo \${image} | sed 's/ubuntu://') - fi - export ARCH=${arch} export DEST_BRANCH=\${DEST_BRANCH:-\$ghprbTargetBranch} export SRC_BRANCH=\${SRC_BRANCH:-\$ghprbSourceBranch} @@ -140,20 +129,9 @@ ci_distro.each { distro -> { shell("""\ #!/bin/bash -xe - wget https://raw.githubusercontent.com/osrf/bash-yaml/master/yaml.sh -O yaml.sh - source yaml.sh - - if [[ -f \${WORKSPACE}/gazebo/bitbucket-pipelines.yml ]]; then - create_variables \${WORKSPACE}/gazebo/bitbucket-pipelines.yml - fi export DISTRO=${distro} - if [[ -n \${image} ]]; then - echo "Bitbucket pipeline.yml detected. Default DISTRO is ${distro}" - export DISTRO=\$(echo \${image} | sed 's/ubuntu://') - fi - export ARCH=${arch} export GPU_SUPPORT_NEEDED=true /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index c0f61bc2f..f755c3a1e 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -290,18 +290,9 @@ ignition_software.each { ign_sw -> steps { shell("""\ #!/bin/bash -xe - wget https://raw.githubusercontent.com/osrf/bash-yaml/master/yaml.sh -O yaml.sh - source yaml.sh - - create_variables \${WORKSPACE}/${checkout_subdir}/bitbucket-pipelines.yml export DISTRO=${distro} - if [[ -n \${image} ]]; then - echo "Bitbucket pipeline.yml detected. Default DISTRO is ${distro}" - export DISTRO=\$(echo \${image} | sed 's/ubuntu://') - fi - ${GLOBAL_SHELL_CMD} export ARCH=${arch} @@ -335,18 +326,9 @@ ignition_software.each { ign_sw -> { shell("""\ #!/bin/bash -xe - wget https://raw.githubusercontent.com/osrf/bash-yaml/master/yaml.sh -O yaml.sh - source yaml.sh - - create_variables \${WORKSPACE}/${ignition_checkout_dir}/bitbucket-pipelines.yml export DISTRO=${ci_distro_str} - if [[ -n \${image} ]]; then - echo "Bitbucket pipeline.yml detected. Default DISTRO is ${ci_distro}" - export DISTRO=\$(echo \${image} | sed 's/ubuntu://') - fi - ${GLOBAL_SHELL_CMD} export ARCH=${arch} diff --git a/jenkins-scripts/dsl/sdformat.dsl b/jenkins-scripts/dsl/sdformat.dsl index 6f3712c61..7460be098 100644 --- a/jenkins-scripts/dsl/sdformat.dsl +++ b/jenkins-scripts/dsl/sdformat.dsl @@ -44,18 +44,9 @@ abi_distro.each { distro -> steps { shell("""\ #!/bin/bash -xe - wget https://raw.githubusercontent.com/osrf/bash-yaml/master/yaml.sh -O yaml.sh - source yaml.sh - - create_variables \${WORKSPACE}/sdformat/bitbucket-pipelines.yml export DISTRO=${distro} - if [[ -n \${image} ]]; then - echo "Bitbucket pipeline.yml detected. Default DISTRO is ${distro}" - export DISTRO=\$(echo \${image} | sed 's/ubuntu://') - fi - export ARCH=${arch} export DEST_BRANCH=\${DEST_BRANCH:-\$ghprbTargetBranch} export SRC_BRANCH=\${SRC_BRANCH:-\$ghprbSourceBranch} @@ -107,18 +98,9 @@ abi_distro.each { distro -> { shell("""\ #!/bin/bash -xe - wget https://raw.githubusercontent.com/osrf/bash-yaml/master/yaml.sh -O yaml.sh - source yaml.sh - - create_variables \${WORKSPACE}/sdformat/bitbucket-pipelines.yml export DISTRO=${ci_distro_str} - if [[ -n \${image} ]]; then - echo "Bitbucket pipeline.yml detected. Default DISTRO is ${ci_distro_str}" - export DISTRO=\$(echo \${image} | sed 's/ubuntu://') - fi - export ARCH=${arch} /bin/bash -xe ./scripts/jenkins-scripts/docker/sdformat-compilation.bash """.stripIndent())