Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👩‍🌾 Remove reliance on bitbucket pipelines files #501

Merged
merged 5 commits into from
Aug 26, 2021
Merged

👩‍🌾 Remove reliance on bitbucket pipelines files #501

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22ef3d5
👩‍🌾 Remove reliance on bitbucket pipelines files
chapulina Aug 23, 2021
ca4b8ec
fix warning in ign-cmake < 2
chapulina Aug 24, 2021
441dfbf
Remove more ✂️
chapulina Aug 24, 2021
6987caa
revert ign-cmake changes
chapulina Aug 24, 2021
271f12e
going all in
chapulina Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions jenkins-scripts/dsl/ignition.dsl
View file
Open in desktop
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
View file
Open in desktop
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