Skip to content

[branch/v13] Added OSS OS packages to APT/YUM/Zypper repos when private releases are published #35224

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.

Sign up for GitHub

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

Merged
fheinecke merged 1 commit into from
Nov 30, 2023
Merged

[branch/v13] Added OSS OS packages to APT/YUM/Zypper repos when private releases are published #35224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5695,9 +5695,8 @@ steps:
- 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
-tag-workflow -series-run -series-run-filter .*apt.* -timeout 12h0m0s -workflow
deploy-packages.yaml -workflow-ref=refs/heads/master -input "artifact-tag=${DRONE_TAG}"
-input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-name-filter=$($DRONE_REPO_PRIVATE
&& echo "*ent*" || echo "")" -input "package-to-test=teleport-ent" -input "release-channel=stable"
-input "repo-type=apt" -input "version-channel=${DRONE_TAG}" '
-input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-to-test=teleport-ent"
-input "release-channel=stable" -input "repo-type=apt" -input "version-channel=${DRONE_TAG}" '
environment:
GHA_APP_KEY:
from_secret: GITHUB_WORKFLOW_APP_PRIVATE_KEY
Expand All @@ -5717,9 +5716,8 @@ steps:
- 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
-tag-workflow -series-run -series-run-filter .*yum.* -timeout 12h0m0s -workflow
deploy-packages.yaml -workflow-ref=refs/heads/master -input "artifact-tag=${DRONE_TAG}"
-input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-name-filter=$($DRONE_REPO_PRIVATE
&& echo "*ent*" || echo "")" -input "package-to-test=teleport-ent" -input "release-channel=stable"
-input "repo-type=yum" -input "version-channel=${DRONE_TAG}" '
-input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-to-test=teleport-ent"
-input "release-channel=stable" -input "repo-type=yum" -input "version-channel=${DRONE_TAG}" '
environment:
GHA_APP_KEY:
from_secret: GITHUB_WORKFLOW_APP_PRIVATE_KEY
Expand Down Expand Up @@ -5781,9 +5779,8 @@ steps:
- 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
-tag-workflow -series-run -series-run-filter .*apt.* -timeout 12h0m0s -workflow
deploy-packages.yaml -workflow-ref=refs/heads/master -input "artifact-tag=${DRONE_TAG}"
-input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-name-filter=$($DRONE_REPO_PRIVATE
&& echo "*ent*" || echo "")" -input "package-to-test=teleport-ent" -input "release-channel=stable"
-input "repo-type=apt" -input "version-channel=rolling" '
-input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-to-test=teleport-ent"
-input "release-channel=stable" -input "repo-type=apt" -input "version-channel=rolling" '
environment:
GHA_APP_KEY:
from_secret: GITHUB_WORKFLOW_APP_PRIVATE_KEY
Expand All @@ -5803,9 +5800,8 @@ steps:
- 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
-tag-workflow -series-run -series-run-filter .*yum.* -timeout 12h0m0s -workflow
deploy-packages.yaml -workflow-ref=refs/heads/master -input "artifact-tag=${DRONE_TAG}"
-input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-name-filter=$($DRONE_REPO_PRIVATE
&& echo "*ent*" || echo "")" -input "package-to-test=teleport-ent" -input "release-channel=stable"
-input "repo-type=yum" -input "version-channel=rolling" '
-input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-to-test=teleport-ent"
-input "release-channel=stable" -input "repo-type=yum" -input "version-channel=rolling" '
environment:
GHA_APP_KEY:
from_secret: GITHUB_WORKFLOW_APP_PRIVATE_KEY
Expand Down Expand Up @@ -16670,6 +16666,6 @@ image_pull_secrets:
- DOCKERHUB_CREDENTIALS
---
kind: signature
hmac: f7637c4d9ea66c2d54cc10556223fcadae04e35352780a615ba7df454f995a1b
hmac: cc52b828d9fcb7d1b41bbd79e616bbe9f127eb8bba52a05350bebfd7dd7f176f

...
29 changes: 15 additions & 14 deletions dronegen/os_repos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ func promoteBuildOsRepoPipeline() pipeline {
packageDeployments := []osPackageDeployment{
// Normal release pipelines
{
versionChannel: "${DRONE_TAG}",
packageNameFilter: `$($DRONE_REPO_PRIVATE && echo "*ent*" || echo "")`,
packageToTest: "teleport-ent",
displayName: "Teleport",
versionChannel: "${DRONE_TAG}",
packageToTest: "teleport-ent",
displayName: "Teleport",
},
// teleport-ent-updater to stable/cloud only pipelines
{
Expand All @@ -44,10 +43,9 @@ func promoteBuildOsRepoPipeline() pipeline {
},
// Rolling release pipelines
{
versionChannel: "rolling",
packageNameFilter: `$($DRONE_REPO_PRIVATE && echo "*ent*" || echo "")`,
packageToTest: "teleport-ent",
displayName: "Teleport",
versionChannel: "rolling",
packageToTest: "teleport-ent",
displayName: "Teleport",
},
}

Expand Down Expand Up @@ -86,12 +84,15 @@ func buildWorkflows(releaseEnvironmentFilePath string, packageDeployments []osPa
for _, packageDeployment := range packageDeployments {
for _, repoType := range repoTypes {
inputs := map[string]string{
"repo-type": repoType,
"environment": fmt.Sprintf("$(cat %q)", releaseEnvironmentFilePath),
"artifact-tag": "${DRONE_TAG}",
"release-channel": "stable",
"version-channel": packageDeployment.versionChannel,
"package-name-filter": packageDeployment.packageNameFilter,
"repo-type": repoType,
"environment": fmt.Sprintf("$(cat %q)", releaseEnvironmentFilePath),
"artifact-tag": "${DRONE_TAG}",
"release-channel": "stable",
"version-channel": packageDeployment.versionChannel,
}

if packageDeployment.packageNameFilter != "" {
inputs["package-name-filter"] = packageDeployment.packageNameFilter
}

if packageDeployment.packageToTest != "" {
Expand Down