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

Jump to bottom

define feature sets for make targets in files #1259

Merged
merged 4 commits into from Sep 21, 2022
Merged

define feature sets for make targets in files #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c424150
feat: define feature sets for make targets in files, rather than havi…
nkraetzschmar Sep 6, 2022
95ee300
feat: add ability to build with _prod to Makefile and use it in night…
nkraetzschmar Sep 21, 2022
8e74ff5
Merge branch 'main' into feat/makefile_targets
nkraetzschmar Sep 21, 2022
d91f1ed
fix: temporary: remove _readonly include from _prod
nkraetzschmar Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Expand Up @@ -5,6 +5,9 @@ on:
version:
type: string
default: today
default_modifier:
type: string
default: ""
use_kms:
type: boolean
default: false
Expand Down Expand Up @@ -47,7 +50,7 @@ jobs:
matrix:
architecture: [ amd64, arm64 ]
target: [ kvm, kvm-secureboot, metal, metal-secureboot, gcp, aws, azure, ali, openstack, vmware, pxe, firecracker, github_action_runner, metalv ]
modifier: [ "" ]
modifier: [ "${{ inputs.default_modifier }}" ]
steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly.yml
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ jobs:
id-token: write
with:
version: now
default_modifier: "-prod"
use_kms: true
secrets:
secureboot_db_kms_arn: ${{ secrets.SECUREBOOT_DB_KMS_ARN }}
Expand Down
121 changes: 11 additions & 110 deletions Makefile
View file
Open in desktop
Expand Up @@ -51,156 +51,57 @@ all_prod: ali aws gcp azure metal openstack vmware kvm metalv

all_dev: ali-dev aws-dev gcp-dev azure-dev metal-dev openstack-dev vmware-dev kvm-dev metalv-dev

ALI_IMAGE_NAME=$(IMAGE_BASENAME)-ali-$(VERSION)
ali: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,ali $(BUILDDIR) $(VERSION)
%: make_targets/% build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features "$$(cat $<)" $(BUILDDIR) $(VERSION)

%-dev: make_targets/% build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features "$$(cat $<),_dev" $(BUILDDIR) $(VERSION)

%-prod: make_targets/% build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features "$$(cat $<),_prod" $(BUILDDIR) $(VERSION)

onmetal: metal

ALI_IMAGE_NAME=$(IMAGE_BASENAME)-ali-$(VERSION)
ali-upload:
aliyun oss cp $(BUILDDIR)/ali-gardener-amd64-$(VERSION)-local/rootfs.qcow2 oss://gardenlinux-development/gardenlinux/$(ALI_IMAGE_NAME).qcow2

ALI_DEV_IMAGE_NAME=$(IMAGE_BASENAME)-dev-ali-$(VERSION)
ali-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,ali,_dev $(BUILDDIR) $(VERSION)

ali-dev-upload:
aliyun oss cp $(BUILDDIR)/ali-gardener_dev-amd64-$(VERSION)-local/rootfs.qcow2 oss://gardenlinux-development/gardenlinux/$(ALI_DEV_IMAGE_NAME).qcow2


AWS_IMAGE_NAME=$(IMAGE_BASENAME)-aws-$(VERSION)
aws: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,aws $(BUILDDIR) $(VERSION)

aws-upload:
./bin/make-ec2-ami --bucket gardenlinux-testing --region eu-north-1 --image-name=$(AWS_IMAGE_NAME) $(BUILDDIR)/aws-gardener-amd64-$(VERSION)-local/rootfs.raw --permission-public "$(PUBLIC)" --distribute "$(AWS_DISTRIBUTE)"

AWS_DEV_IMAGE_NAME=$(IMAGE_BASENAME)-dev-aws-$(VERSION)
aws-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,aws,_dev $(BUILDDIR) ${VERSION}

aws-dev-upload:
./bin/make-ec2-ami --bucket ami-debian-image-test --region eu-north-1 --image-name=$(AWS_DEV_IMAGE_NAME) $(BUILDDIR)/aws-gardener_dev-amd64-$(VERSION)-local/rootfs.raw --permission-public "$(PUBLIC)" --distribute "$(AWS_DISTRIBUTE)"

GCP_IMAGE_NAME=$(IMAGE_BASENAME)-gcp-$(VERSION)
gcp: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,gcp $(BUILDDIR) $(VERSION)

gcp-upload:
./bin/make-gcp-ami --bucket garden-linux-test --image-name $(GCP_IMAGE_NAME) --raw-image-path $(BUILDDIR)/gcp-gardener-amd64-$(VERSION)-local/rootfs-gcpimage.tar.gz --permission-public "$(PUBLIC)"

GCP_DEV_IMAGE_NAME=$(IMAGE_BASENAME)-dev-gcp-$(VERSION)
gcp-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,gcp,_dev $(BUILDDIR) $(VERSION)

gcp-dev-upload:
./bin/make-gcp-ami --bucket garden-linux-test --image-name $(GCP_DEV_IMAGE_NAME) --raw-image-path $(BUILDDIR)/gcp-gardener_dev-amd64-$(VERSION)-local/rootfs-gcpimage.tar.gz --permission-public "$(PUBLIC)"

AZURE_IMAGE_NAME=$(IMAGE_BASENAME)-az-$(VERSION)
azure: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,azure $(BUILDDIR) $(VERSION)

azure-upload:
./bin/make-azure-ami --resource-group garden-linux --storage-account-name gardenlinux --image-path=$(BUILDDIR)/azure-gardener-amd64-$(VERSION)-local/rootfs.vhd --image-name=$(AZURE_IMAGE_NAME)

AZURE_DEV_IMAGE_NAME=$(IMAGE_BASENAME)-dev-az-$(VERSION)
azure-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,azure,_dev $(BUILDDIR) $(VERSION)

azure-dev-upload:
./bin/make-azure-ami --resource-group garden-linux --storage-account-name gardenlinuxdev --image-path=$(BUILDDIR)/azure-gardener_dev-amd64-$(VERSION)-local/rootfs.vhd --image-name=$(AZURE_DEV_IMAGE_NAME)


OPENSTACK_IMAGE_NAME=$(IMAGE_BASENAME)-openstack-$(VERSION)
openstack: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,openstack $(BUILDDIR) $(VERSION)

openstack-upload:
./bin/upload-openstack $(BUILDDIR)/openstack-gardener-amd64-$(VERSION)-local/rootfs.vmdk $(OPENSTACK_IMAGE_NAME)

OPENSTACK_DEV_IMAGE_NAME=$(IMAGE_BASENAME)-openstack-dev-$(VERSION)
openstack-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,openstack,_dev $(BUILDDIR) $(VERSION)

openstack-dev-upload:
./bin/upload-openstack $(BUILDDIR)/openstack-gardener_dev-amd64-$(VERSION)-local/rootfs.vmdk $(OPENSTACK_DEV_IMAGE_NAME)

openstack-qcow2: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --features server,cloud,gardener,openstack-qcow2 $(BUILDDIR) $(VERSION)

VMWARE_DEV_IMAGE_NAME=$(IMAGE_BASENAME)-vmware-dev-$(VERSION)
vmware-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,vmware,_dev $(BUILDDIR) $(VERSION)

VMWARE_VMOPERATOR_DEV_IMAGE_NAME=$(IMAGE_BASENAME)-vmware-vmoperator-dev-$(VERSION)
vmware-vmoperator-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,vmware-vmoperator,_dev $(BUILDDIR)/vmware-vmoperator-dev $(VERSION)

vmware: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,gardener,vmware $(BUILDDIR) $(VERSION)

cloud: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud $(BUILDDIR) $(VERSION)

kvm: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,kvm $(BUILDDIR) $(VERSION)

kvm-secureboot: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,kvm,_secureboot $(BUILDDIR) $(VERSION)

kvm-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,kvm,_dev $(BUILDDIR) $(VERSION)

kvm-secureboot-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,kvm,_secureboot,_dev $(BUILDDIR) $(VERSION)

firecracker: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features firecracker $(BUILDDIR) $(VERSION)

firecracker-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features firecracker,_dev $(BUILDDIR) $(VERSION)

pxe: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features metal,server,_pxe $(BUILDDIR) $(VERSION)

pxe-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features metal,server,_dev,_pxe $(BUILDDIR) $(VERSION)

metal-iso: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features metal,server,_iso $(BUILDDIR) $(VERSION)

anvil: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud-anvil,kvm,_dev $(BUILDDIR) $(VERSION)

onmetal: metal
metal: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,metal $(BUILDDIR) $(VERSION)

metal-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,metal,_dev $(BUILDDIR) $(VERSION)

metalk: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features metal,khost,_pxe $(BUILDDIR) $(VERSION)

metalk-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features metal,khost,_pxe,_dev $(BUILDDIR) $(VERSION)

metal-secureboot: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,metal,_secureboot $(BUILDDIR) $(VERSION)

metal-secureboot-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,metal,_secureboot,_dev $(BUILDDIR) $(VERSION)

metalv: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,metal,vhost $(BUILDDIR) $(VERSION)

metalv-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,metal,vhost,_dev $(BUILDDIR) $(VERSION)

github_action_runner: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,aws,github_action_runner $(BUILDDIR) $(VERSION)

github_action_runner-dev: build-environment $(SECUREBOOT_CRT)
./build.sh $(BUILD_OPTS) --skip-build --features server,cloud,aws,github_action_runner,_dev $(BUILDDIR) $(VERSION)

clean:
@echo "emptying $(BUILDDIR)"
@rm -rf $(BUILDDIR)/*
Expand Down
1 change: 0 additions & 1 deletion features/_prod/info.yaml
View file
Open in desktop
Expand Up @@ -2,4 +2,3 @@ type: flag
features:
include:
- _nopkg
- _readonly
1 change: 1 addition & 0 deletions make_targets/ali
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,gardener,ali
1 change: 1 addition & 0 deletions make_targets/anvil
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud-anvil,kvm,_dev
1 change: 1 addition & 0 deletions make_targets/aws
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,gardener,aws
1 change: 1 addition & 0 deletions make_targets/azure
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,gardener,azure
1 change: 1 addition & 0 deletions make_targets/cloud
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud
1 change: 1 addition & 0 deletions make_targets/firecracker
View file
Open in desktop
@@ -0,0 +1 @@
firecracker
1 change: 1 addition & 0 deletions make_targets/gcp
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,gardener,gcp
1 change: 1 addition & 0 deletions make_targets/github_action_runner
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,aws,github_action_runner
1 change: 1 addition & 0 deletions make_targets/kvm
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,kvm
1 change: 1 addition & 0 deletions make_targets/kvm-secureboot
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,kvm,_secureboot
1 change: 1 addition & 0 deletions make_targets/metal
View file
Open in desktop
@@ -0,0 +1 @@
server,metal
1 change: 1 addition & 0 deletions make_targets/metal-iso
View file
Open in desktop
@@ -0,0 +1 @@
metal,server,_iso
1 change: 1 addition & 0 deletions make_targets/metal-secureboot
View file
Open in desktop
@@ -0,0 +1 @@
server,metal,_secureboot
1 change: 1 addition & 0 deletions make_targets/metalk
View file
Open in desktop
@@ -0,0 +1 @@
metal,khost,_pxe
1 change: 1 addition & 0 deletions make_targets/metalv
View file
Open in desktop
@@ -0,0 +1 @@
server,metal,vhost
1 change: 1 addition & 0 deletions make_targets/openstack
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,gardener,openstack
1 change: 1 addition & 0 deletions make_targets/openstack-qcow2
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,gardener,openstack-qcow2
1 change: 1 addition & 0 deletions make_targets/pxe
View file
Open in desktop
@@ -0,0 +1 @@
metal,server,_pxe
1 change: 1 addition & 0 deletions make_targets/vmware
View file
Open in desktop
@@ -0,0 +1 @@
server,cloud,gardener,vmware