Skip to content

Use build flavour instead of testing #82

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use build flavour instead of testing #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df9bc87
Use build flavour instead of testing
garyservin Mar 27, 2024
33b0e24
Wait for nbd partition to exist before continuing
garyservin May 7, 2024
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
8 changes: 4 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def parentImage = { release, docker_registry -> docker_registry - "https://" + '
def distributions = []
def images = null
def organization = null
def testing_flavour = null
def build_flavour = null

pipeline {
agent none
Expand Down Expand Up @@ -57,7 +57,7 @@ pipeline {
// (pbovbel) Read configuration from rosdistro. This should probably happen in some kind of Python
def recipes_config = readYaml(file: recipes_yaml)
organization = recipes_config['common']['organization']
testing_flavour = recipes_config['common']['testing_flavour']
build_flavour = recipes_config['common']['build_flavour']
distributions = recipes_config['os'].collect {
os, distribution -> distribution }.flatten()

Expand Down Expand Up @@ -99,7 +99,7 @@ pipeline {
"--build-arg APT_REGION=${params.apt_region} " +
"--build-arg RELEASE_LABEL=${params.release_label} " +
"--build-arg RELEASE_TRACK=${params.release_track} " +
"--build-arg FLAVOUR=${testing_flavour} " +
"--build-arg FLAVOUR=${build_flavour} " +
"--build-arg ORGANIZATION=${organization} " +
"--build-arg AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID " +
"--build-arg AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY " +
Expand Down Expand Up @@ -162,7 +162,7 @@ pipeline {
--apt-repo ${params.apt_repo - 's3://'} \
--release-track ${params.release_track} \
--release-label ${params.release_label} \
--flavour ${testing_flavour} \
--flavour ${build_flavour} \
--organization ${organization} \
--docker-registry ${params.docker_registry} \
--rosdistro-path /rosdistro \
Expand Down
1 change: 1 addition & 0 deletions environment/image_recipes/bare_metal/bare_metal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"inline": [
"echo 'Resize image'",
"qemu-nbd -c /dev/nbd0 images/{{user `image_name`}}.qcow2",
"while [ ! -f '/dev/nbd0p1' ]; echo 'Waiting for nbd to be ready'; sleep 1; done",
"e2fsck -y -f /dev/nbd0p1",
"resize2fs /dev/nbd0p1 -M",
"qemu-nbd -d /dev/nbd0",
Expand Down