Skip to content

Commit

Permalink
Add batch buildspec for Tinkerbell Rufio project (#4155)
Browse files Browse the repository at this point in the history
  • Loading branch information
abhay-krishna authored Dec 18, 2024
1 parent 3d81c82 commit 101d14c
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 14 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ generate-staging-buildspec: | ensure-locale
build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "isc-projects_dhcp" "$(BASE_DIRECTORY)/projects/isc-projects/dhcp/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_hook" "$(BASE_DIRECTORY)/projects/tinkerbell/hook/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_ipxedust" "$(BASE_DIRECTORY)/projects/tinkerbell/ipxedust/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_rufio" "$(BASE_DIRECTORY)/projects/tinkerbell/rufio/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_tink" "$(BASE_DIRECTORY)/projects/tinkerbell/tink/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "linuxkit_linuxkit" "$(BASE_DIRECTORY)/projects/linuxkit/linuxkit/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "emissary-ingress_emissary" "$(BASE_DIRECTORY)/projects/emissary-ingress/emissary/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true "DO_NOT_EXCLUDE_FROM_BUILDSPEC"
Expand Down
1 change: 1 addition & 0 deletions projects/aws/cluster-api-provider-aws-snow/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SIMPLE_CREATE_TARBALLS=false
HAS_LICENSES=false
IMAGE_COMPONENT=aws/cluster-api-provider-aws-snow/manager

EXCLUDE_FROM_STAGING_BUILDSPEC=true
EXCLUDE_FROM_CHECKSUMS_BUILDSPEC=true
EXCLUDE_FROM_UPGRADE_BUILDSPEC=true

Expand Down
14 changes: 14 additions & 0 deletions projects/tinkerbell/rufio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@ SOURCE_PATTERNS=.

HAS_S3_ARTIFACTS=true

# we need to set IMAGE_BUILD_ARGS here even though its the same as the default.
# it is set in Common.mk on the images target (https://github.com/aws/eks-anywhere-build-tooling/blob/8b6d6d66974e881b22e3c9c8ea29adc26f7df5fd/Common.mk#L799)
# and the combine-images target (https://github.com/aws/eks-anywhere-build-tooling/blob/8b6d6d66974e881b22e3c9c8ea29adc26f7df5fd/Common.mk#L846)
# since combine-images has images as prereq target, the ?= does not really behave as one might expect.
# the images target being the actual action, its version of the set takes prioirty and resets to empty
# setting it explicitly to empty here takes allows the combine-images override to take proirty
IMAGE_BUILD_ARGS=
DOCKERFILE_FOLDER=./docker/linux
BUILDSPECS=buildspec.yml buildspecs/combine-images.yml
BUILDSPEC_1_DEPENDS_ON_OVERRIDE=none
BUILDSPEC_1_VARS_KEYS=IMAGE_PLATFORMS
BUILDSPEC_1_VARS_VALUES=IMAGE_PLATFORMS
BUILDSPEC_1_ARCH_TYPES=LINUX_CONTAINER ARM_CONTAINER

include $(BASE_DIRECTORY)/Common.mk

s3-artifacts: create-manifests
Expand Down
48 changes: 48 additions & 0 deletions projects/tinkerbell/rufio/buildspecs/batch-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

# http://www.apache.org/licenses/LICENSE-2.0

# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# This file was generated by running `make generate`. DO NOT EDIT

batch:
fast-fail: true
build-graph:
- identifier: tinkerbell_rufio_linux_amd64
env:
type: LINUX_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
IMAGE_PLATFORMS: linux/amd64
BINARY_PLATFORMS: linux/amd64
IMAGE_TAG_SUFFIX: -amd64
- identifier: tinkerbell_rufio_linux_arm64
env:
type: ARM_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
IMAGE_PLATFORMS: linux/arm64
BINARY_PLATFORMS: linux/arm64
IMAGE_TAG_SUFFIX: -arm64
- identifier: tinkerbell_rufio
buildspec: buildspecs/combine-images.yml
env:
type: ARM_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
version: 0.2
phases:
pre_build:
commands:
- ./build/lib/setup.sh
build:
commands:
- if $(make check-project-path-exists) && make check-for-release-branch-skip -C $PROJECT_PATH; then make release -C $PROJECT_PATH; fi
1 change: 1 addition & 0 deletions projects/tinkerbell/tinkerbell-chart/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ HELM_SOURCE_REPOSITORY=.
HELM_IMAGE_LIST=
HELM_CHART_NAMES=$(REPO_OWNER)/$(REPO)

EXCLUDE_FROM_STAGING_BUILDSPEC=true
EXCLUDE_FROM_UPGRADE_BUILDSPEC=true

include $(BASE_DIRECTORY)/Common.mk
Expand Down
34 changes: 21 additions & 13 deletions release/staging-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ batch:
variables:
PROJECT_PATH: projects/aws/bottlerocket-bootstrap
RELEASE_BRANCH: 1-31
- identifier: aws_cluster_api_provider_aws_snow
env:
type: ARM_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
PROJECT_PATH: projects/aws/cluster-api-provider-aws-snow
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/aws.cluster-api-provider-aws-snow
- identifier: aws_eks_anywhere
env:
type: ARM_CONTAINER
Expand Down Expand Up @@ -939,7 +932,28 @@ batch:
PROJECT_PATH: projects/tinkerbell/ipxedust
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.ipxedust
BINARY_PLATFORMS: linux/arm64
- identifier: tinkerbell_rufio_linux_amd64
env:
type: LINUX_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
PROJECT_PATH: projects/tinkerbell/rufio
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
IMAGE_PLATFORMS: linux/amd64
BINARY_PLATFORMS: linux/amd64
IMAGE_TAG_SUFFIX: -amd64
- identifier: tinkerbell_rufio_linux_arm64
env:
type: ARM_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
PROJECT_PATH: projects/tinkerbell/rufio
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
IMAGE_PLATFORMS: linux/arm64
BINARY_PLATFORMS: linux/arm64
IMAGE_TAG_SUFFIX: -arm64
- identifier: tinkerbell_rufio
buildspec: buildspecs/combine-images.yml
env:
type: ARM_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
Expand Down Expand Up @@ -977,12 +991,6 @@ batch:
variables:
PROJECT_PATH: projects/tinkerbell/tink
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.tink
- identifier: tinkerbell_tinkerbell_chart
env:
type: ARM_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
PROJECT_PATH: projects/tinkerbell/tinkerbell-chart
- identifier: tinkerbell_tinkerbell_crds
env:
type: ARM_CONTAINER
Expand Down
15 changes: 14 additions & 1 deletion tools/version-tracker/buildspecs/upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -445,13 +445,26 @@ batch:
IMAGE_PLATFORMS: linux/arm64
BINARY_PLATFORMS: linux/arm64
IMAGE_TAG_SUFFIX: -arm64
- identifier: tinkerbell_rufio
- identifier: tinkerbell_rufio_linux_amd64
env:
type: LINUX_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
PROJECT_PATH: projects/tinkerbell/rufio
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
IMAGE_PLATFORMS: linux/amd64
BINARY_PLATFORMS: linux/amd64
IMAGE_TAG_SUFFIX: -amd64
- identifier: tinkerbell_rufio_linux_arm64
env:
type: ARM_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
PROJECT_PATH: projects/tinkerbell/rufio
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
IMAGE_PLATFORMS: linux/arm64
BINARY_PLATFORMS: linux/arm64
IMAGE_TAG_SUFFIX: -arm64
- identifier: tinkerbell_tink_linux_amd64
env:
type: LINUX_CONTAINER
Expand Down

0 comments on commit 101d14c

Please sign in to comment.