From 8b21591e17de92fbc8f4e5ca8f21b9cbd732b19c Mon Sep 17 00:00:00 2001 From: fheinecke <23390735+fheinecke@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:04:03 -0600 Subject: [PATCH] [branch/v13] Added OSS OS packages to APT/YUM/Zypper repos when private releases are published --- .drone.yml | 22 +++++++++------------- dronegen/os_repos.go | 29 +++++++++++++++-------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index a3a621d47c66d..d410aa54646ad 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -16670,6 +16666,6 @@ image_pull_secrets: - DOCKERHUB_CREDENTIALS --- kind: signature -hmac: f7637c4d9ea66c2d54cc10556223fcadae04e35352780a615ba7df454f995a1b +hmac: cc52b828d9fcb7d1b41bbd79e616bbe9f127eb8bba52a05350bebfd7dd7f176f ... diff --git a/dronegen/os_repos.go b/dronegen/os_repos.go index f9da8c7bc920a..66b0404f0ec96 100644 --- a/dronegen/os_repos.go +++ b/dronegen/os_repos.go @@ -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 { @@ -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", }, } @@ -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 != "" {