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.

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

Fix concourse acceptance #2194

Merged
merged 2 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ SHELL := /bin/bash
.SHELLFLAGS := -eu -o pipefail -c ${SHELLFLAGS}
MAKEFLAGS = -s

go_modules := $(shell find . -maxdepth 3 -name "*.mod" -exec dirname {} \; | sed 's|\./src/||' | sort)
go-acceptance-dir := ./src/acceptance
go-autoscaler-dir := ./src/autoscaler
go-changelog-dir := ./src/changelog
go-changeloglockcleander-dir := ./src/changeloglockcleaner
go-test-app-dir := ./src/acceptance/assets/app/go_app

go_modules := $(shell find . -maxdepth 3 -name "*.mod" -exec dirname {} \; | sed 's|\./src/||' | sort)
all_modules := $(go_modules) db scheduler

MVN_OPTS = "-Dmaven.test.skip=true"
Expand All @@ -23,7 +29,8 @@ CI ?= false
VERSION ?= 0.0.testing
DEST ?= build

GOLANGCI_LINT_VERSION = v$(shell cat .tool-versions | grep golangci-lint | cut --delimiter=' ' --fields='2')
GOLANGCI_LINT_VERSION = v$(shell cat .tool-versions | grep golangci-lint \
| cut --delimiter=' ' --fields='2')

export BUILDIN_MODE ?= false
export DEBUG ?= false
Expand Down Expand Up @@ -257,18 +264,17 @@ acceptance-release: clean-acceptance go-mod-tidy vendor build-test-app
@mkdir -p ${DEST}
@tar --create --auto-compress --directory="src" --file="${ACCEPTANCE_TESTS_FILE}" 'acceptance'


.PHONY: generate-fakes autoscaler.generate-fakes test-app.generate-fakes
generate-fakes: autoscaler.generate-fakes test-app.generate-fakes
autoscaler.generate-fakes:
make --directory='${go-autoscaler-dir}' generate-fakes
test-app.generate-fakes:
make --directory='${go-test-app-dir}' generate-fakes

.PHONY: go-mod-tidy
go-mod-tidy: acceptance.go-mod-tidy autoscaler.go-mod-tidy changelog.go-mod-tidy \
changeloglockcleander.go-mod-tidy test-app.go-mod-tidy

go-acceptance-dir := ./src/acceptance
go-autoscaler-dir := ./src/autoscaler
go-changelog-dir := ./src/changelog
go-changeloglockcleander-dir := ./src/changeloglockcleaner
go-test-app-dir := ./src/acceptance/assets/app/go_app

.PHONY: acceptance.go-mod-tidy autoscaler.go-mod-tidy changelog.go-mod-tidy \
changeloglockcleander.go-mod-tidy test-app.go-mod-tidy
acceptance.go-mod-tidy:
Expand Down
35 changes: 20 additions & 15 deletions ci/autoscaler/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ anchors:
operations/remove-metricsgateway.yml
operations/enable-scheduler-logging.yml


app-autoscaler-ops-files-upgrade: &app-autoscaler-ops-files-upgrade
OPS_FILES: |
operations/add-releases.yml
Expand Down Expand Up @@ -234,9 +233,10 @@ jobs:
trigger: true
- get: ci
- task: make-prerelease
file: ci/ci/autoscaler/tasks/make/make.yml
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: go-mod-tidy vendor db scheduler
# ⚠️ Here it is used that make officially guarantees to reach the goals in the provided order.
TARGETS: generate-fakes go-mod-tidy go-mod-vendor db scheduler
- task: deploy-autoscaler
file: ci/ci/autoscaler/tasks/deploy-autoscaler.yml
params:
Expand Down Expand Up @@ -280,9 +280,10 @@ jobs:
trigger: true
- get: ci
- task: make-prerelease
file: ci/ci/autoscaler/tasks/make/make.yml
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: go-mod-tidy vendor db scheduler
# ⚠️ Here it is used that make officially guarantees to reach the goals in the provided order.
TARGETS: generate-fakes go-mod-tidy go-mod-vendor db scheduler
- task: deploy-autoscaler
file: ci/ci/autoscaler/tasks/deploy-autoscaler.yml
params:
Expand Down Expand Up @@ -328,9 +329,10 @@ jobs:
trigger: true
- get: ci
- task: make-prerelease
file: ci/ci/autoscaler/tasks/make/make.yml
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: go-mod-tidy vendor db scheduler
# ⚠️ Here it is used that make officially guarantees to reach the goals in the provided order.
TARGETS: generate-fakes go-mod-tidy go-mod-vendor db scheduler
- task: deploy-autoscaler
file: ci/ci/autoscaler/tasks/deploy-autoscaler.yml
params:
Expand Down Expand Up @@ -365,9 +367,10 @@ jobs:
- get: bbl-state
- get: app-autoscaler-release
- task: make-prerelease
file: ci/ci/autoscaler/tasks/make/make.yml
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: go-mod-tidy vendor db scheduler
# ⚠️ Here it is used that make officially guarantees to reach the goals in the provided order.
TARGETS: generate-fakes go-mod-tidy go-mod-vendor db scheduler
- task: deploy-autoscaler
file: ci/ci/autoscaler/tasks/deploy-autoscaler.yml
params:
Expand All @@ -378,11 +381,11 @@ jobs:
params:
<<: *performance-env
- task: setup-performance
file: ci/ci/autoscaler/tasks/make/make.yml
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: setup-performance
- task: run-performance
file: ci/ci/autoscaler/tasks/make/make.yml
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: run-performance

Expand Down Expand Up @@ -422,9 +425,10 @@ jobs:
pre_upgrade
NODES: 1
- task: make-prerelease
file: ci/ci/autoscaler/tasks/make/make.yml
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: go-mod-tidy vendor db scheduler
# ⚠️ Here it is used that make officially guarantees to reach the goals in the provided order.
TARGETS: generate-fakes go-mod-tidy go-mod-vendor db scheduler
- task: deploy-autoscaler
file: ci/ci/autoscaler/tasks/deploy-autoscaler.yml
params:
Expand All @@ -451,9 +455,10 @@ jobs:
passed: [upgrade-test]
- get: ci
- task: make-prerelease
file: ci/ci/autoscaler/tasks/make/make.yml
file: ci/ci/autoscaler/tasks/make/make.yaml
params:
TARGETS: go-mod-tidy vendor db scheduler
# ⚠️ Here it is used that make officially guarantees to reach the goals in the provided order.
TARGETS: generate-fakes go-mod-tidy go-mod-vendor db scheduler
- task: release-autoscaler
file: ci/ci/autoscaler/tasks/release-autoscaler.yml
params:
Expand Down
4 changes: 2 additions & 2 deletions ci/autoscaler/tasks/make/make.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# shellcheck disable=SC2086
set -euo pipefail
set -eu -o pipefail

make -C $1 ${TARGETS}
make --directory="${1}" ${TARGETS}
File renamed without changes.
Loading