Skip to content

Commit e2c451f

Browse files
committed
look for opslevel.yml in parent dirs
1 parent 0f076ae commit e2c451f

13 files changed

Lines changed: 229 additions & 39 deletions

File tree

.github/workflows/artifacts.yml

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
# Generated using halfpipe cli version 0.0.0-DEV from file e2e/concourse/update-pipeline-and-tag/.halfpipe.io for team halfpipe-team
2+
jobs:
3+
- build_log_retention:
4+
minimum_succeeded_builds: 1
5+
name: update
6+
plan:
7+
- attempts: 2
8+
get: git
9+
timeout: 15m
10+
trigger: true
11+
- attempts: 2
12+
config:
13+
image_resource:
14+
name: ""
15+
source:
16+
password: ((halfpipe-gcr.private_key))
17+
registry_mirror:
18+
host: eu-mirror.gcr.io
19+
repository: eu.gcr.io/halfpipe-io/halfpipe-auto-update
20+
tag: latest
21+
username: _json_key
22+
type: registry-image
23+
inputs:
24+
- name: git
25+
params:
26+
CONCOURSE_PASSWORD: ((concourse.password))
27+
CONCOURSE_TEAM: ((concourse.team))
28+
CONCOURSE_URL: ((concourse.url))
29+
CONCOURSE_USERNAME: ((concourse.username))
30+
HALFPIPE_DOMAIN: halfpipe.io
31+
HALFPIPE_FILE_PATH: .halfpipe.io
32+
HALFPIPE_PROJECT: halfpipe-io
33+
PIPELINE_NAME: pipeline-name
34+
platform: linux
35+
run:
36+
dir: git/e2e/concourse/update-pipeline-and-tag
37+
path: update-pipeline
38+
task: update
39+
timeout: 15m
40+
- attempts: 2
41+
params:
42+
bump: minor
43+
put: version
44+
timeout: 15m
45+
- attempts: 2
46+
no_get: true
47+
params:
48+
only_tag: true
49+
repository: git
50+
tag: version/version
51+
tag_prefix: pipeline-name/v
52+
put: tag-git-repository
53+
resource: git
54+
timeout: 15m
55+
serial: true
56+
- build_log_retention:
57+
minimum_succeeded_builds: 1
58+
name: test
59+
plan:
60+
- attempts: 2
61+
in_parallel:
62+
fail_fast: true
63+
steps:
64+
- get: git
65+
passed:
66+
- update
67+
- get: version
68+
passed:
69+
- update
70+
trigger: true
71+
timeout: 15m
72+
- config:
73+
caches:
74+
- path: ../../../var/halfpipe/cache
75+
- path: ../../../halfpipe-cache
76+
image_resource:
77+
name: ""
78+
source:
79+
registry_mirror:
80+
host: eu-mirror.gcr.io
81+
repository: node
82+
tag: 9.5.0-alpine
83+
type: registry-image
84+
inputs:
85+
- name: git
86+
- name: version
87+
params:
88+
ARTIFACTORY_PASSWORD: ((artifactory.password))
89+
ARTIFACTORY_URL: ((artifactory.url))
90+
ARTIFACTORY_USERNAME: ((artifactory.username))
91+
CI: "true"
92+
EE_PLATFORM_TEAM: halfpipe-team
93+
RUNNING_IN_CI: "true"
94+
platform: linux
95+
run:
96+
args:
97+
- -c
98+
- |
99+
if ! which bash > /dev/null && [ "$SUPPRESS_BASH_WARNING" != "true" ]; then
100+
echo "WARNING: Bash is not present in the docker image"
101+
echo "If your script depends on bash you will get a strange error message like:"
102+
echo " sh: yourscript.sh: command not found"
103+
echo "To fix, make sure your docker image contains bash!"
104+
echo "Or if you are sure you don't need bash you can suppress this warning by setting the environment variable \"SUPPRESS_BASH_WARNING\" to \"true\"."
105+
echo ""
106+
echo ""
107+
fi
108+
109+
if [ -e /etc/alpine-release ]
110+
then
111+
echo "WARNING: you are running your build in a Alpine image or one that is based on the Alpine"
112+
echo "There is a known issue where DNS resolving does not work as expected"
113+
echo "https://github.com/gliderlabs/docker-alpine/issues/255"
114+
echo "If you see any errors related to resolving hostnames the best course of action is to switch to another image"
115+
echo "we recommend debian:buster-slim as an alternative"
116+
echo ""
117+
echo ""
118+
fi
119+
120+
export GIT_REVISION=`cat ../../../.git/ref`
121+
export BUILD_VERSION=`cat ../../../../version/version`
122+
123+
./../update-pipeline/a
124+
EXIT_STATUS=$?
125+
if [ $EXIT_STATUS != 0 ] ; then
126+
exit 1
127+
fi
128+
dir: git/e2e/concourse/update-pipeline-and-tag
129+
path: /bin/sh
130+
task: test
131+
timeout: 1h
132+
serial: true
133+
resources:
134+
- check_every: 10m0s
135+
name: git
136+
source:
137+
branch: main
138+
private_key: ((halfpipe-github.private_key))
139+
uri: git@github.com:springernature/halfpipe.git
140+
type: git
141+
- check_every: 24h0m0s
142+
name: version
143+
source:
144+
bucket: ((halfpipe-semver.bucket))
145+
driver: gcs
146+
json_key: ((halfpipe-semver.private_key))
147+
key: halfpipe-team-pipeline-name
148+
type: semver

cmd/cmds/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func getManifestAndController(halfpipeFilenameOptions []string, renderer halfpip
158158
outputLintResults(linters.LintResults{linters.NewLintResult("Halfpipe Manifest", "https://ee.public.springernature.app/rel-eng/halfpipe/manifest/", manErrors)})
159159
}
160160

161-
opsLevel, _, opsLevelErr := manifest.ParseOpsLevel(fs, currentDir)
161+
opsLevel, _, opsLevelErr := manifest.ParseOpsLevel(fs, currentDir, projectData.GitRootPath)
162162
if opsLevelErr != nil {
163163
fmt.Fprintf(os.Stderr, "WARNING: %s\n", opsLevelErr)
164164
} else {

e2e/actions/deploy-cf/opslevel.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

e2e/actions/deploy-cf/workflowExpected.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
appPath: e2e/actions/deploy-cf/foo.html
101101
cliVersion: cf7
102102
command: halfpipe-all
103-
eaid: appl-12345
103+
eaid: halfpipe
104104
gitUri: git@github.com:springernature/halfpipe.git
105105
manifestPath: e2e/actions/deploy-cf/manifest.yml
106106
org: ${{ steps.secrets.outputs.springernature_data_halfpipe-team_cloudfoundry_org-snpaas }}
@@ -164,7 +164,7 @@ jobs:
164164
appPath: e2e/actions/deploy-cf/foo.html
165165
cliVersion: cf8
166166
command: halfpipe-all
167-
eaid: appl-12345
167+
eaid: halfpipe
168168
gitUri: git@github.com:springernature/halfpipe.git
169169
manifestPath: e2e/actions/deploy-cf/manifest.yml
170170
org: ${{ steps.secrets.outputs.springernature_data_halfpipe-team_cloudfoundry_org-snpaas }}
@@ -229,7 +229,7 @@ jobs:
229229
appPath: e2e/actions/deploy-cf/foo.html
230230
cliVersion: cf7
231231
command: halfpipe-push
232-
eaid: appl-12345
232+
eaid: halfpipe
233233
gitUri: git@github.com:springernature/halfpipe.git
234234
manifestPath: e2e/actions/deploy-cf/manifest.yml
235235
org: ${{ steps.secrets.outputs.springernature_data_halfpipe-team_cloudfoundry_org-snpaas }}
@@ -394,7 +394,7 @@ jobs:
394394
dockerPassword: ${{ steps.secrets.outputs.springernature_data_shared_halfpipe-gcr_private_key_base64 }}
395395
dockerTag: ${{ env.BUILD_VERSION }}
396396
dockerUsername: _json_key
397-
eaid: appl-12345
397+
eaid: halfpipe
398398
gitUri: git@github.com:springernature/halfpipe.git
399399
manifestPath: e2e/actions/deploy-cf/manifest-docker.yml
400400
org: ${{ steps.secrets.outputs.springernature_data_halfpipe-team_cloudfoundry_org-snpaas }}
@@ -466,7 +466,7 @@ jobs:
466466
appPath: e2e/actions/deploy-cf/foo.html
467467
cliVersion: cf7
468468
command: halfpipe-all
469-
eaid: appl-12345
469+
eaid: halfpipe
470470
gitUri: git@github.com:springernature/halfpipe.git
471471
manifestPath: e2e/actions/deploy-cf/manifest.yml
472472
org: ${{ steps.secrets.outputs.springernature_data_halfpipe-team_cloudfoundry_org-snpaas }}
@@ -531,7 +531,7 @@ jobs:
531531
appPath: e2e/actions/deploy-cf
532532
cliVersion: cf7
533533
command: halfpipe-all
534-
eaid: appl-12345
534+
eaid: halfpipe
535535
gitUri: git@github.com:springernature/halfpipe.git
536536
manifestPath: e2e/actions/deploy-cf/manifest.yml
537537
org: ${{ steps.secrets.outputs.springernature_data_halfpipe-team_cloudfoundry_org-snpaas }}

e2e/concourse/artifacts/pipelineExpected.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ jobs:
268268
appPath: git/e2e/concourse/artifacts
269269
cliVersion: cf7
270270
command: halfpipe-push
271+
eaid: halfpipe
271272
gitRefPath: git/.git/ref
272273
gitUri: git@github.com:springernature/halfpipe.git
273274
manifestPath: git/e2e/concourse/artifacts/manifest.yml

e2e/concourse/deploy-cf-docker-image/pipelineExpected.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
command: halfpipe-all
7777
dockerPassword: ((halfpipe-gcr.private_key))
7878
dockerUsername: _json_key
79+
eaid: halfpipe
7980
gitRefPath: git/.git/ref
8081
gitUri: git@github.com:springernature/halfpipe.git
8182
manifestPath: git/e2e/concourse/deploy-cf-docker-image/manifest.yml
@@ -130,6 +131,7 @@ jobs:
130131
dockerPassword: ((halfpipe-gcr.private_key))
131132
dockerTag: git/.git/ref
132133
dockerUsername: _json_key
134+
eaid: halfpipe
133135
gitRefPath: git/.git/ref
134136
gitUri: git@github.com:springernature/halfpipe.git
135137
manifestPath: git/e2e/concourse/deploy-cf-docker-image/manifest.yml
@@ -258,6 +260,7 @@ jobs:
258260
dockerPassword: ((halfpipe-gcr.private_key))
259261
dockerTag: version/version
260262
dockerUsername: _json_key
263+
eaid: halfpipe
261264
gitRefPath: git/.git/ref
262265
gitUri: git@github.com:springernature/halfpipe.git
263266
manifestPath: git/e2e/concourse/deploy-cf-docker-image/manifest.yml
@@ -301,6 +304,7 @@ jobs:
301304
dockerPassword: ((halfpipe-gcr.private_key))
302305
dockerTag: git/.git/ref
303306
dockerUsername: _json_key
307+
eaid: halfpipe
304308
gitRefPath: git/.git/ref
305309
gitUri: git@github.com:springernature/halfpipe.git
306310
instances: 1
@@ -392,6 +396,7 @@ jobs:
392396
dockerPassword: ((halfpipe-gcr.private_key))
393397
dockerTag: git/.git/ref
394398
dockerUsername: _json_key
399+
eaid: halfpipe
395400
gitRefPath: git/.git/ref
396401
gitUri: git@github.com:springernature/halfpipe.git
397402
manifestPath: git/e2e/concourse/deploy-cf-docker-image/manifest.yml

e2e/concourse/deploy-cf-rolling/pipelineExpected.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
appPath: git/e2e/concourse/deploy-cf-rolling
2323
cliVersion: cf7
2424
command: halfpipe-rolling-deploy
25+
eaid: halfpipe
2526
gitRefPath: git/.git/ref
2627
gitUri: git@github.com:springernature/halfpipe.git
2728
manifestPath: git/e2e/concourse/deploy-cf-rolling/manifest.yml
@@ -56,6 +57,7 @@ jobs:
5657
appPath: git/e2e/concourse/deploy-cf-rolling
5758
cliVersion: cf7
5859
command: halfpipe-push
60+
eaid: halfpipe
5961
gitRefPath: git/.git/ref
6062
gitUri: git@github.com:springernature/halfpipe.git
6163
instances: 1
@@ -142,6 +144,7 @@ jobs:
142144
appPath: git/e2e/concourse/deploy-cf-rolling
143145
cliVersion: cf7
144146
command: halfpipe-rolling-deploy
147+
eaid: halfpipe
145148
gitRefPath: git/.git/ref
146149
gitUri: git@github.com:springernature/halfpipe.git
147150
manifestPath: git/e2e/concourse/deploy-cf-rolling/manifest.yml

e2e/concourse/deploy-cf-with-artefact/pipelineExpected.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ jobs:
154154
appPath: artifacts/e2e/concourse/deploy-cf-with-artefact/build/linux/binary
155155
cliVersion: cf7
156156
command: halfpipe-push
157+
eaid: halfpipe
157158
gitRefPath: git/.git/ref
158159
gitUri: git@github.com:springernature/halfpipe.git
159160
manifestPath: git/e2e/concourse/deploy-cf/manifest.yml

e2e/concourse/notifications/pipelineExpected.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ jobs:
297297
appPath: git/e2e/concourse/notifications
298298
cliVersion: cf7
299299
command: halfpipe-push
300+
eaid: halfpipe
300301
gitRefPath: git/.git/ref
301302
gitUri: git@github.com:springernature/halfpipe.git
302303
manifestPath: git/e2e/concourse/notifications/manifest.yml

e2e/concourse/notifications_new_format/pipelineExpected.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ jobs:
255255
appPath: git/e2e/concourse/notifications_new_format
256256
cliVersion: cf7
257257
command: halfpipe-push
258+
eaid: halfpipe
258259
gitRefPath: git/.git/ref
259260
gitUri: git@github.com:springernature/halfpipe.git
260261
manifestPath: git/e2e/concourse/notifications_new_format/manifest.yml

0 commit comments

Comments
 (0)