Skip to content

Conversation

@russcam
Copy link
Contributor

@russcam russcam commented Apr 15, 2020

This commit updates the cluster.remote.connect setting to allow
integration tests to run against master 8.0.0 snapshots

This commit updates the cluster.remote.connect setting to allow
integration tests to run against master 8.0.0 snapshots
@russcam
Copy link
Contributor Author

russcam commented Apr 15, 2020

the failing tests have been addressed in master in 44135c1 and PR #4590. Merging this in

@russcam russcam merged commit 33826ed into master Apr 15, 2020
@russcam russcam deleted the fix/master/update-cluster-remote-connect branch April 15, 2020 03:31
@github-actions
Copy link
Contributor

The backport to 7.6 failed:

The process 'git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.6 7.6
# Navigate to the new working tree
cd .worktrees/backport-7.6
# Create a new branch
git switch --create backport-4589-to-7.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 33826edfd58981735a79d9a0029c5fc65b70ecb6
# Push it to GitHub
git push --set-upstream origin backport-4589-to-7.6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.6

Then, create a pull request where the base branch is 7.6 and the compare/head branch is backport-4589-to-7.6.

@github-actions
Copy link
Contributor

The backport to 7.7 failed:

The process 'git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.7 7.7
# Navigate to the new working tree
cd .worktrees/backport-7.7
# Create a new branch
git switch --create backport-4589-to-7.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 33826edfd58981735a79d9a0029c5fc65b70ecb6
# Push it to GitHub
git push --set-upstream origin backport-4589-to-7.7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.7

Then, create a pull request where the base branch is 7.7 and the compare/head branch is backport-4589-to-7.7.

@github-actions
Copy link
Contributor

The backport to 7.x failed:

The process 'git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.x 7.x
# Navigate to the new working tree
cd .worktrees/backport-7.x
# Create a new branch
git switch --create backport-4589-to-7.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 33826edfd58981735a79d9a0029c5fc65b70ecb6
# Push it to GitHub
git push --set-upstream origin backport-4589-to-7.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.x

Then, create a pull request where the base branch is 7.x and the compare/head branch is backport-4589-to-7.x.

russcam added a commit that referenced this pull request Apr 15, 2020
This commit updates the cluster.remote.connect setting to allow
integration tests to run against master 8.0.0 snapshots

(cherry picked from commit 33826ed)
russcam added a commit that referenced this pull request Apr 15, 2020
This commit updates the cluster.remote.connect setting to allow
integration tests to run against master 8.0.0 snapshots

(cherry picked from commit 33826ed)
@russcam
Copy link
Contributor Author

russcam commented Apr 15, 2020

manually ported to 7.x and 7.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants