Skip to content

Commit

Permalink
ci: pin release to loki-2.8.x tag in loki-release (#12271)
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorwhitney authored Mar 20, 2024
1 parent 536e9cd commit e3b830d
Show file tree
Hide file tree
Showing 14 changed files with 426 additions and 118 deletions.
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "v1.11.5"
"version": "loki-2.8.x"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "09374df9ca39fa58ec93d9e3fad4da1593186039",
"sum": "eMlN1tvu1jxKTdWvNfmXESn7JI+Wfu2C1wCabo7P2VQ="
"version": "a8a4aef8af51e3de53a17838a9798acfbb85f1fa",
"sum": "ehDGacNILjqjRolJv4FyRroujA9uXtng/aJYNQmN4Zs="
}
],
"legacyImports": false
Expand Down
30 changes: 19 additions & 11 deletions .github/release-workflows.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,50 @@ local imageJobs = {
logstash: build.image('logstash-output-loki', 'clients/cmd/logstash', platform=['linux/amd64']),
logcli: build.image('logcli', 'cmd/logcli'),
'loki-canary': build.image('loki-canary', 'cmd/loki-canary'),
'loki-operator': build.image('loki-operator', 'operator', context='release/operator', platform=['linux/amd64']),
'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
promtail: build.image('promtail', 'clients/cmd/promtail'),
querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
};

local buildImage = 'grafana/loki-build-image:0.29.3-go1.20.10';
local golangCiLintVersion = 'v1.51.2';

local imageBuildTimeoutMin = 40;
local imagePrefix = 'grafana';

{
'patch-release-pr.yml': std.manifestYamlDoc(
lokiRelease.releasePRWorkflow(
imageJobs=imageJobs,
buildImage='grafana/loki-build-image:0.29.3-go1.20.10',
branches=['release-[0-9]+.[0-9]+.x'],
buildImage=buildImage,
checkTemplate=checkTemplate,
golangCiLintVersion='v1.51.2',
imagePrefix='grafana',
golangCiLintVersion=golangCiLintVersion,
imageBuildTimeoutMin=imageBuildTimeoutMin,
imageJobs=imageJobs,
imagePrefix=imagePrefix,
releaseLibRef=releaseLibRef,
releaseRepo='grafana/loki',
skipArm=false,
skipValidation=false,
versioningStrategy='always-bump-patch',
useGitHubAppToken=true,
versioningStrategy='always-bump-patch',
), false, false
),
'minor-release-pr.yml': std.manifestYamlDoc(
lokiRelease.releasePRWorkflow(
imageJobs=imageJobs,
buildImage='grafana/loki-build-image:0.29.3-go1.20.10',
branches=['k[0-9]+'],
buildImage=buildImage,
checkTemplate=checkTemplate,
golangCiLintVersion='v1.51.2',
imagePrefix='grafana',
golangCiLintVersion=golangCiLintVersion,
imageBuildTimeoutMin=imageBuildTimeoutMin,
imageJobs=imageJobs,
imagePrefix=imagePrefix,
releaseLibRef=releaseLibRef,
releaseRepo='grafana/loki',
skipArm=false,
skipValidation=false,
versioningStrategy='always-bump-minor',
useGitHubAppToken=true,
versioningStrategy='always-bump-minor',
), false, false
),
'release.yml': std.manifestYamlDoc(
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e3b830d

Please sign in to comment.