Skip to content

Commit

Permalink
👩‍🌾 Remove reliance on bitbucket pipelines files (#501)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina authored Aug 26, 2021
1 parent 12a0884 commit 3f7649b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 58 deletions.
22 changes: 0 additions & 22 deletions jenkins-scripts/dsl/gazebo.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
18 changes: 0 additions & 18 deletions jenkins-scripts/dsl/ignition.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down
18 changes: 0 additions & 18 deletions jenkins-scripts/dsl/sdformat.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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())
Expand Down

0 comments on commit 3f7649b

Please sign in to comment.