Skip to content

[v11] Add enterprise module support to Connect builds (#17315) #17329

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
avatus merged 5 commits into from
Oct 12, 2022
Merged

[v11] Add enterprise module support to Connect builds (#17315) #17329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0517553
Add enterprise module support to Connect builds (#17315)
avatus Oct 12, 2022
6c638ff
Merge branch 'branch/v11' into michaelmyers/backport/17315
avatus Oct 12, 2022
28279e9
Merge branch 'branch/v11' into michaelmyers/backport/17315
avatus Oct 12, 2022
d79723b
Merge branch 'branch/v11' into michaelmyers/backport/17315
avatus Oct 12, 2022
af206d1
Merge branch 'branch/v11' into michaelmyers/backport/17315
avatus Oct 12, 2022
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
23 changes: 22 additions & 1 deletion .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,9 @@ steps:
-F /dev/null' git submodule update --init e
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init --recursive webassets || true
- cd $WORKSPACE_DIR/go/src/github.com/gravitational/webapps
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init packages/webapps.e
- rm -rf $WORKSPACE_DIR/.ssh
- mkdir -p $WORKSPACE_DIR/go/cache
environment:
Expand Down Expand Up @@ -694,11 +697,14 @@ steps:
- $ErrorActionPreference = 'Stop'
- $Workspace = "$Env:WORKSPACE_DIR/$Env:DRONE_BUILD_NUMBER"
- $TeleportSrc = "$Workspace/go/src/github.com/gravitational/teleport"
- $WebappsSrc = "$Workspace/go/src/github.com/gravitational/webapps"
- . "$TeleportSrc/build.assets/windows/build.ps1"
- Enable-Git -Workspace $Workspace -PrivateKey $Env:GITHUB_PRIVATE_KEY
- cd $TeleportSrc
- git submodule update --init e
- git submodule update --init --recursive webassets
- cd $WebappsSrc
- git submodule update --init packages/webapps.e
- Reset-Git -Workspace $Workspace
environment:
GITHUB_PRIVATE_KEY:
Expand Down Expand Up @@ -962,11 +968,14 @@ steps:
- $ErrorActionPreference = 'Stop'
- $Workspace = "$Env:WORKSPACE_DIR/$Env:DRONE_BUILD_NUMBER"
- $TeleportSrc = "$Workspace/go/src/github.com/gravitational/teleport"
- $WebappsSrc = "$Workspace/go/src/github.com/gravitational/webapps"
- . "$TeleportSrc/build.assets/windows/build.ps1"
- Enable-Git -Workspace $Workspace -PrivateKey $Env:GITHUB_PRIVATE_KEY
- cd $TeleportSrc
- git submodule update --init e
- git submodule update --init --recursive webassets
- cd $WebappsSrc
- git submodule update --init packages/webapps.e
- Reset-Git -Workspace $Workspace
environment:
GITHUB_PRIVATE_KEY:
Expand Down Expand Up @@ -4390,6 +4399,9 @@ steps:
-F /dev/null' git submodule update --init e
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init --recursive webassets || true
- cd $WORKSPACE_DIR/go/src/github.com/gravitational/webapps
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init packages/webapps.e
- rm -rf $WORKSPACE_DIR/.ssh
- mkdir -p $WORKSPACE_DIR/go/cache
- mkdir -p $WORKSPACE_DIR/go/artifacts
Expand Down Expand Up @@ -4616,6 +4628,9 @@ steps:
-F /dev/null' git submodule update --init e
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init --recursive webassets || true
- cd $WORKSPACE_DIR/go/src/github.com/gravitational/webapps
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init packages/webapps.e
- rm -rf $WORKSPACE_DIR/.ssh
- mkdir -p $WORKSPACE_DIR/go/cache
- mkdir -p $WORKSPACE_DIR/go/artifacts
Expand Down Expand Up @@ -4814,6 +4829,9 @@ steps:
-F /dev/null' git submodule update --init e
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init --recursive webassets || true
- cd $WORKSPACE_DIR/go/src/github.com/gravitational/webapps
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init packages/webapps.e
- rm -rf $WORKSPACE_DIR/.ssh
- mkdir -p $WORKSPACE_DIR/go/cache
- mkdir -p $WORKSPACE_DIR/go/artifacts
Expand Down Expand Up @@ -8777,6 +8795,9 @@ steps:
-F /dev/null' git submodule update --init e
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init --recursive webassets || true
- cd $WORKSPACE_DIR/go/src/github.com/gravitational/webapps
- GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts
-F /dev/null' git submodule update --init packages/webapps.e
- rm -rf $WORKSPACE_DIR/.ssh
- mkdir -p $WORKSPACE_DIR/go/cache
- mkdir -p $WORKSPACE_DIR/go/artifacts
Expand Down Expand Up @@ -8956,6 +8977,6 @@ steps:
WORKSPACE_DIR: /tmp/build-darwin-amd64-connect
---
kind: signature
hmac: 5541685d7fc687b7ffa7e3619a6e2558b079d9097b953cb3c8d1f4340abfecd9
hmac: 0b2fed5fd5450f6701ef0bfc2ccd90e40590bd73d8ed9ba3c8bbeea6b978c8d7

...
2 changes: 2 additions & 0 deletions dronegen/mac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ func pushCheckoutCommandsDarwin(artifactConfig darwinArtifactConfig) []string {
`GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts -F /dev/null' git submodule update --init e`,
// this is allowed to fail because pre-4.3 Teleport versions don't use the webassets submodule
`GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts -F /dev/null' git submodule update --init --recursive webassets || true`,
`cd $WORKSPACE_DIR/go/src/github.com/gravitational/webapps`,
`GIT_SSH_COMMAND='ssh -i $WORKSPACE_DIR/.ssh/id_rsa -o UserKnownHostsFile=$WORKSPACE_DIR/.ssh/known_hosts -F /dev/null' git submodule update --init packages/webapps.e`,
`rm -rf $WORKSPACE_DIR/.ssh`,
`mkdir -p $WORKSPACE_DIR/go/cache`,
)
Expand Down
3 changes: 3 additions & 0 deletions dronegen/windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,14 @@ func updateWindowsSubreposStep(workspace string) step {
`$ErrorActionPreference = 'Stop'`,
`$Workspace = "` + perBuildWorkspace + `"`,
`$TeleportSrc = "$Workspace` + teleportSrc + `"`,
`$WebappsSrc = "$Workspace` + webappsSrc + `"`,
`. "$TeleportSrc/build.assets/windows/build.ps1"`,
`Enable-Git -Workspace $Workspace -PrivateKey $Env:GITHUB_PRIVATE_KEY`,
`cd $TeleportSrc`,
`git submodule update --init e`,
`git submodule update --init --recursive webassets`,
`cd $WebappsSrc`,
`git submodule update --init packages/webapps.e`,
`Reset-Git -Workspace $Workspace`,
},
}
Expand Down