Merge pull request #3731 from cloudfoundry/pipeline-fixes

Fixes for the pipeline

Author: joergdw

.envrc

@@ -8,12 +8,9 @@ then
     # for more details
 fi
 
-local bbl_state_dir=../app-autoscaler-env-bbl-state/bbl-state
-if has bbl && [[ -d "$bbl_state_dir" ]]
-then
-    BBL_STATE_DIRECTORY="$(realpath "$bbl_state_dir")"
-    export BBL_STATE_DIRECTORY
-    eval "$(bbl print-env)"
-fi
+local bbl_state_dir=${BBL_STATE_PATH:-'../app-autoscaler-env-bbl-state/bbl-state'}
+source './ci/autoscaler/scripts/common.sh'
+bosh_login "${bbl_state_dir}"
+echo '🚸 Login for bosh and concourse successful! For more execute: `make cf-login`'
 
-export DBURL="postgres://postgres:postgres@localhost/autoscaler"
+export DBURL='postgres://postgres:postgres@localhost/autoscaler'

.gitignore

@@ -1,3 +1,14 @@
+# # Edit: Please use global git-ignore for this, see official hints in the description of gitignore
+# # on <https://git-scm.com/docs/gitignore>.
+#
+# # macOS system file that stores folder metadata (safe to ignore)
+# .DS_Store
+
+
+# ================================================================================
+# 🤖 Generated files
+# ================================================================================
+
 config/dev.yml
 config/private.yml
 releases/*.tgz
@@ -66,16 +77,11 @@ keys/
 .trunk
 
 
-# ==================== 📦 Devbox ====================
+# ==================== 📦 Devbox, ❄ Nix, direnv ====================
 .devbox
 
-# ==================== ❄ Nix ====================
-
 # Ignore links to  build-output:
 /result
 /result-*
 
 .direnv
-
-# # macOS system file that stores folder metadata (safe to ignore)
-.DS_Store

Makefile

@@ -38,7 +38,7 @@ export GOWORK = off
 $(shell mkdir -p target)
 $(shell mkdir -p build)
 
-.DEFAULT_GOAL := build-all
+.DEFAULT_GOAL := build_all
 
 .PHONY: check-type
 check-db_type:
@@ -300,8 +300,11 @@ spec-test:
 	bundle exec rspec
 
 .PHONY: bosh-release
-bosh-release: go-mod-tidy go-mod-vendor scheduler db build/autoscaler-test.tgz
-build/autoscaler-test.tgz:
+bosh-release: build/autoscaler-test.tgz
+# 🚸 In the next line, the order of the dependencies is important. Generated code needs to be
+# already there for `go-mod-tidy` to work. See additional comment for that target in
+# ./src/autoscaler/Makefile.
+build/autoscaler-test.tgz: build_all go-mod-tidy go-mod-vendor
 	@echo " - building bosh release into build/autoscaler-test.tgz"
 	@mkdir -p build
 	@bosh create-release --force --timestamp-version --tarball=build/autoscaler-test.tgz
@@ -370,7 +373,7 @@ deploy-autoscaler-bosh: db.java-libs go-mod-vendor scheduler.build
 	echo " - deploying autoscaler"
 	DEBUG="${DEBUG}" ${CI_DIR}/autoscaler/scripts/deploy-autoscaler.sh
 deploy-cleanup:
-	${CI_DIR}/autoscaler/scripts/cleanup-autoscaler.sh;
+	${CI_DIR}/autoscaler/scripts/cleanup-autoscaler.sh
 
 bosh-release-path := ./target/bosh-releases
 prometheus-bosh-release-path := ${bosh-release-path}/prometheus
@@ -442,8 +445,11 @@ cleanup-autoscaler-deployments:
 	@${CI_DIR}/autoscaler/scripts/cleanup-autoscaler-deployments.sh
 
 .PHONY: cf-login
-cf-login: ## Login to OSS CF dev environment
-	@${CI_DIR}/autoscaler/scripts/cf-login.sh
+cf-login:
+	@echo '⚠️ Please note that this login only works for cf and concourse,' \
+		  'in spite of performing a login as well on bosh and credhub.' \
+		  'The necessary changes to the environment get lost when make exits its process.'
+	@${CI_DIR}/autoscaler/scripts/os-infrastructure-login.sh
 
 .PHONY: setup-performance
 setup-performance: build-test-app
@@ -484,6 +490,7 @@ alerts-silence:
 	${CI_DIR}/autoscaler/scripts/silence_prometheus_alert.sh BOSHJobEphemeralDiskPredictWillFill ;\
 	${CI_DIR}/autoscaler/scripts/silence_prometheus_alert.sh BOSHJobUnhealthy ;
 
+
 .PHONY: docker-login docker docker-image
 docker-login: target/docker-login
 target/docker-login:
@@ -493,7 +500,6 @@ docker-image: docker-login
 	docker build -t ghcr.io/cloudfoundry/app-autoscaler-release-tools:latest  ci/dockerfiles/autoscaler-tools
 	docker push ghcr.io/cloudfoundry/app-autoscaler-release-tools:latest
 
-
 validate-openapi-specs: $(wildcard ./api/*.openapi.yaml)
 	for file in $^ ; do \
 		redocly lint --extends=minimal --format=$(if $(GITHUB_ACTIONS),github-actions,codeframe) "$${file}" ; \

ci/.gitignore

@@ -0,0 +1,3 @@
+# ================================================================================
+# 🤖 Generated files
+# ================================================================================

ci/Makefile

@@ -1,3 +1,30 @@
+.ONESHELL:
+SHELL := /bin/bash
+.SHELLFLAGS := -eu -o pipefail -c
+
+repository-root := $(shell realpath --relative-to $$(pwd) $$(git rev-parse --show-toplevel))
+
+# All files that together define the development-environment:
+development-environment-definition := \
+	$(wildcard ${repository-root}/nix/**/*) \
+	${repository-root}/devbox.json \
+	${repository-root}/devbox.lock
+
+# 🚸 Overwrite the following parameters to work with a different repository on a different registry:
+OCI_REGISTRY ?= ghcr.io
+OCI_REPOSITORY ?= cloudfoundry/app-autoscaler-release-tools
+OCI_TAG ?= main
+
+.PHONY: docker-login
+docker-login:
+	@logged_in=$$(jq '.auths | has("${OCI_REGISTRY}")' ~/.docker/config.json)
+	readonly logged_in
+	if [[ "$${logged_in}" != 'true' ]]
+	then
+		docker login '${OCI_REGISTRY}'
+	else
+		echo 'Already logged in into ${OCI_REGISTRY}, skipping login.'
+	fi
 
 .PHONY: set-autoscaler-pipeline
 set-autoscaler-pipeline:
@@ -15,10 +42,6 @@ unpause-pipeline:
 delete-pipeline:
 	@./scripts/delete-pipeline.sh
 
-.PHONY: set-target
-set-target:
-	@fly --target app-autoscaler-release login --team-name app-autoscaler --concourse-url https://concourse.app-runtime-interfaces.ci.cloudfoundry.org
-
 .PHONY: lint
 lint:
 	@shellcheck --external-sources --shell='bash' **/scripts/*.sh