From 7f3d495d0f0d9cbfcee2a2dd60167ff0725fec8f Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 5 May 2023 12:25:37 +0000 Subject: [PATCH] Squashed '.ci/' changes from 50a6d67..aea1ccc aea1ccc Only add branch name to tags, if not part of actual tag a5875db Make EXTRA_TAGS work again 63421d1 fix: prevent branch_name equals tag 47140c2 feat: append branch into tags if not main 4b62ada chore: improve messaging a49cc0c chore: improve messaging 194afb4 chore: get ci working again 8ec9769 chore: get ci working again fef4968 fix: do NOT push PRs to registry, other fixes git-subtree-dir: .ci git-subtree-split: aea1cccfff35de2ef2eca138379a599c8bde39e0 --- podman.mk | 30 +++++++++++++++++++++--------- vars/buildPodman.groovy | 16 +++++++++------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/podman.mk b/podman.mk index 1eb9b7c..b4b086e 100644 --- a/podman.mk +++ b/podman.mk @@ -1,12 +1,22 @@ # Parse version from latest git semver tag -BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) -GIT_TAG=$(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null) -TAG ?= $(shell echo $(GIT_TAG) | awk -F '-' '{ print $$1 "-" $$2 }' | sed -e 's/-$$//') -# EXTRA_TAGS supposed to be set at the caller, eg. $(shell echo $(TAG) | awk -F '.' '{ print $$1 "." $$2 }') +GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) +GIT_TAG := $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null) + +TAG := $(GIT_TAG) +# append branch name to tag if NOT main nor master +ifeq (,$(filter main master, $(GIT_BRANCH))) + # If branch is substring of tag, omit branch name + ifeq ($(findstring $(GIT_BRANCH), $(GIT_TAG)),) + # only append branch name if not equal tag + ifneq ($(GIT_TAG), $(GIT_BRANCH)) + TAG = $(GIT_TAG)-$(GIT_BRANCH) + endif + endif +endif ARCH := amd64 ALL_ARCHS := amd64 arm64 -_ARCH = $(or $(filter ${ARCH},${ALL_ARCHS}),$(error $$ARCH [${ARCH}] must be exactly one of ${ALL_ARCHS})) +_ARCH = $(or $(filter $(ARCH),$(ALL_ARCHS)),$(error $$ARCH [$(ARCH)] must be exactly one of "$(ALL_ARCHS)")) ifneq ($(TRIVY_REMOTE),) TRIVY_OPTS := --server $(TRIVY_REMOTE) @@ -39,12 +49,14 @@ scan: ## Scan image using trivy # create new manifest for each tag and add all available TAG-ARCH before pushing push: ecr-login ## push images to registry for t in $(TAG) latest $(EXTRA_TAGS); do \ + echo "Tagging image with $(REGISTRY)/$(IMAGE):$${t}-$(ARCH)" buildah tag $(IMAGE):$(TAG)-$(_ARCH) $(REGISTRY)/$(IMAGE):$${t}-$(_ARCH); \ buildah manifest rm $(IMAGE):$$t || true; \ buildah manifest create $(IMAGE):$$t; \ for a in $(ALL_ARCHS); do \ buildah manifest add $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$(TAG)-$$a; \ done; \ + echo "Pushing manifest $(IMAGE):$$t" buildah manifest push --all $(IMAGE):$$t docker://$(REGISTRY)/$(IMAGE):$$t; \ done @@ -59,13 +71,13 @@ rm-remote-untagged: ## delete all remote untagged images [ -n "$$IMAGE_IDS" ] && aws ecr-public batch-delete-image --repository-name $(IMAGE) --region $(REGION) --image-ids $$IMAGE_IDS || echo "No image to remove" rm-image: - test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(_ARCH))" || podman image rm -f $(IMAGE):$(TAG)-$(_ARCH) > /dev/null - test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(_ARCH))" || echo "Error: Removing image failed" + test -z "$$(podman image ls -q $(IMAGE):$(TAG)-$(_ARCH))" || podman image rm -f $(IMAGE):$(TAG)-$(_ARCH) > /dev/null + test -z "$$(podman image ls -q $(IMAGE):$(TAG)-$(_ARCH))" || echo "Error: Removing image failed" # Ensure we run the tests by removing any previous runs rm-test-image: - test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(_ARCH)-test)" || podman image rm -f $(IMAGE):$(TAG)-$(_ARCH)-test > /dev/null - test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(_ARCH)-test)" || echo "Error: Removing test image failed" + test -z "$$(podman image ls -q $(IMAGE):$(TAG)-$(_ARCH)-test)" || podman image rm -f $(IMAGE):$(TAG)-$(_ARCH)-test > /dev/null + test -z "$$(podman image ls -q $(IMAGE):$(TAG)-$(_ARCH)-test)" || echo "Error: Removing test image failed" ci-pull-upstream: ## pull latest shared .ci subtree git stash && git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash && git stash pop diff --git a/vars/buildPodman.groovy b/vars/buildPodman.groovy index 0a3a539..e5ecff9 100644 --- a/vars/buildPodman.groovy +++ b/vars/buildPodman.groovy @@ -7,12 +7,14 @@ def call(Map config=[:]) { label 'podman-aws-trivy' } } - stages { stage('Prepare') { - // get tags steps { - sh 'git fetch -q --tags ${GIT_URL} +refs/heads/${BRANCH_NAME}:refs/remotes/origin/${BRANCH_NAME}' + // pull tags + withCredentials([gitUsernamePassword(credentialsId: 'gitea-jenkins-user')]) { + sh 'git fetch -q --tags ${GIT_URL}' + } + sh 'make prepare || true' } } @@ -36,8 +38,7 @@ def call(Map config=[:]) { TRIVY_OUTPUT = "reports/trivy.html" } steps { - sh 'mkdir -p reports' - sh 'make scan' + sh 'mkdir -p reports && make scan' publishHTML target: [ allowMissing: true, alwaysLinkToLastBuild: true, @@ -59,10 +60,11 @@ def call(Map config=[:]) { } } - // Push to ECR + // Push to container registry, skip if PR stage('Push') { + when { not { changeRequest() } } steps { - sh 'make ecr-login push' + sh 'make push' } }