Skip to content

Commit 64a73ac

Browse files
authored
(PE-36836) Twingate retry connection (#387)
1 parent 159d965 commit 64a73ac

4 files changed

+76
-76
lines changed

.github/workflows/test-install-latest-dev.yaml

+23-23
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ on:
55
workflow_dispatch:
66
inputs:
77
image:
8-
description: 'GCP image for test cluster'
8+
description: "GCP image for test cluster"
99
required: true
10-
default: 'almalinux-cloud/almalinux-8'
10+
default: "almalinux-cloud/almalinux-8"
1111
architecture:
1212
type: choice
1313
required: true
14-
default: 'standard'
15-
description: 'PE architecture to test'
16-
options:
17-
- standard
18-
- standard-with-dr
19-
- large
20-
- large-with-dr
21-
- extra-large
22-
- extra-large-with-dr
14+
default: "standard"
15+
description: "PE architecture to test"
16+
options:
17+
- standard
18+
- standard-with-dr
19+
- large
20+
- large-with-dr
21+
- extra-large
22+
- extra-large-with-dr
2323
ssh-debugging:
24-
description: 'Boolean; whether or not to pause for ssh debugging'
24+
description: "Boolean; whether or not to pause for ssh debugging"
2525
required: true
26-
default: 'false'
26+
default: "false"
2727

2828
jobs:
2929
test-install:
@@ -32,7 +32,7 @@ jobs:
3232
env:
3333
BOLT_GEM: true
3434
BOLT_DISABLE_ANALYTICS: true
35-
LANG: 'en_US.UTF-8'
35+
LANG: "en_US.UTF-8"
3636
strategy:
3737
fail-fast: false
3838
matrix:
@@ -42,7 +42,7 @@ jobs:
4242
- "${{ github.event.inputs.image }}"
4343

4444
steps:
45-
- name: 'Start SSH session'
45+
- name: "Start SSH session"
4646
if: ${{ github.event.inputs.ssh-debugging == 'true' }}
4747
uses: luchihoratiu/debug-via-ssh@main
4848
with:
@@ -65,7 +65,7 @@ jobs:
6565
bundle env
6666
echo ::endgroup::
6767
68-
- name: 'Provision test cluster'
68+
- name: "Provision test cluster"
6969
timeout-minutes: 15
7070
run: |
7171
echo ::group::prepare
@@ -92,17 +92,17 @@ jobs:
9292
sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
9393
echo ::endgroup::
9494
95-
- name: 'Activate twingate to obtain unreleased build'
96-
uses: timidri/twingate-github-action@main
95+
- name: "Activate twingate to obtain unreleased build"
96+
uses: comfucios/twingate-github-action@main
9797
with:
9898
service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
9999

100-
- name: 'Get latest build name'
100+
- name: "Get latest build name"
101101
id: latest
102102
run: |
103103
echo "::set-output name=ver::$(curl -q https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/main/ci-ready/LATEST)"
104104
105-
- name: 'Install PE on test cluster'
105+
- name: "Install PE on test cluster"
106106
timeout-minutes: 120
107107
run: |
108108
bundle exec bolt plan run peadm_spec::install_test_cluster \
@@ -113,16 +113,16 @@ jobs:
113113
architecture=${{ matrix.architecture }} \
114114
pe_installer_source="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/main/ci-ready/puppet-enterprise-${{ steps.latest.outputs.ver }}-el-8-x86_64.tar"
115115
116-
- name: 'Wait as long as the file ${HOME}/pause file is present'
116+
- name: "Wait as long as the file ${HOME}/pause file is present"
117117
if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
118118
run: |
119119
while [ -f "${HOME}/pause" ] ; do
120120
echo "${HOME}/pause present, sleeping for 60 seconds..."
121121
sleep 60
122-
done
122+
done
123123
echo "${HOME}/pause absent, continuing workflow."
124124
125-
- name: 'Tear down test cluster'
125+
- name: "Tear down test cluster"
126126
if: ${{ always() }}
127127
continue-on-error: true
128128
run: |

.github/workflows/test-install-latest-xlarge-dev-nightly.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: "Install latest dev test nightly"
33

44
on:
55
schedule:
6-
- cron: '0 3 * * *'
6+
- cron: "0 3 * * *"
77
workflow_dispatch:
88
inputs:
99
ssh-debugging:
10-
description: 'Boolean; whether or not to pause for ssh debugging'
10+
description: "Boolean; whether or not to pause for ssh debugging"
1111
required: true
12-
default: 'false'
12+
default: "false"
1313

1414
jobs:
1515
test-install:
@@ -18,17 +18,17 @@ jobs:
1818
env:
1919
BOLT_GEM: true
2020
BOLT_DISABLE_ANALYTICS: true
21-
LANG: 'en_US.UTF-8'
21+
LANG: "en_US.UTF-8"
2222
strategy:
2323
fail-fast: false
2424
matrix:
2525
architecture:
26-
- 'extra-large-with-dr'
26+
- "extra-large-with-dr"
2727
image:
28-
- 'almalinux-cloud/almalinux-8'
28+
- "almalinux-cloud/almalinux-8"
2929

3030
steps:
31-
- name: 'Start SSH session'
31+
- name: "Start SSH session"
3232
if: ${{ github.event.inputs.ssh-debugging == 'true' }}
3333
uses: luchihoratiu/debug-via-ssh@main
3434
with:
@@ -51,7 +51,7 @@ jobs:
5151
bundle env
5252
echo ::endgroup::
5353
54-
- name: 'Provision test cluster'
54+
- name: "Provision test cluster"
5555
timeout-minutes: 15
5656
run: |
5757
echo ::group::prepare
@@ -78,17 +78,17 @@ jobs:
7878
sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
7979
echo ::endgroup::
8080
81-
- name: 'Activate twingate to obtain unreleased build'
82-
uses: timidri/twingate-github-action@main
81+
- name: "Activate twingate to obtain unreleased build"
82+
uses: comfucios/twingate-github-action@main
8383
with:
8484
service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
8585

86-
- name: 'Get latest build name'
86+
- name: "Get latest build name"
8787
id: latest
8888
run: |
8989
echo "::set-output name=ver::$(curl -q https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/main/ci-ready/LATEST)"
9090
91-
- name: 'Install PE on test cluster'
91+
- name: "Install PE on test cluster"
9292
timeout-minutes: 120
9393
run: |
9494
bundle exec bolt plan run peadm_spec::install_test_cluster \
@@ -99,16 +99,16 @@ jobs:
9999
architecture=${{ matrix.architecture }} \
100100
pe_installer_source="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/main/ci-ready/puppet-enterprise-${{ steps.latest.outputs.ver }}-el-8-x86_64.tar"
101101
102-
- name: 'Wait as long as the file ${HOME}/pause file is present'
102+
- name: "Wait as long as the file ${HOME}/pause file is present"
103103
if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
104104
run: |
105105
while [ -f "${HOME}/pause" ] ; do
106106
echo "${HOME}/pause present, sleeping for 60 seconds..."
107107
sleep 60
108-
done
108+
done
109109
echo "${HOME}/pause absent, continuing workflow."
110110
111-
- name: 'Tear down test cluster'
111+
- name: "Tear down test cluster"
112112
if: ${{ always() }}
113113
continue-on-error: true
114114
run: |

.github/workflows/test-upgrade-latest-dev.yaml

+26-26
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ on:
55
workflow_dispatch:
66
inputs:
77
image:
8-
description: 'GCP image for test cluster'
8+
description: "GCP image for test cluster"
99
required: true
10-
default: 'almalinux-cloud/almalinux-8'
10+
default: "almalinux-cloud/almalinux-8"
1111
architecture:
1212
type: choice
1313
required: true
14-
default: 'standard'
15-
description: 'PE architecture to test'
16-
options:
17-
- standard
18-
- standard-with-dr
19-
- large
20-
- large-with-dr
21-
- extra-large
22-
- extra-large-with-dr
14+
default: "standard"
15+
description: "PE architecture to test"
16+
options:
17+
- standard
18+
- standard-with-dr
19+
- large
20+
- large-with-dr
21+
- extra-large
22+
- extra-large-with-dr
2323
version:
2424
type: string
2525
required: true
26-
description: 'The initial version of PE to install before upgrade'
27-
default: '2021.7.4'
26+
description: "The initial version of PE to install before upgrade"
27+
default: "2021.7.4"
2828
ssh-debugging:
29-
description: 'Boolean; whether or not to pause for ssh debugging'
29+
description: "Boolean; whether or not to pause for ssh debugging"
3030
required: true
31-
default: 'false'
31+
default: "false"
3232

3333
jobs:
3434
test-upgrade:
@@ -37,7 +37,7 @@ jobs:
3737
env:
3838
BOLT_GEM: true
3939
BOLT_DISABLE_ANALYTICS: true
40-
LANG: 'en_US.UTF-8'
40+
LANG: "en_US.UTF-8"
4141
strategy:
4242
fail-fast: false
4343
matrix:
@@ -49,7 +49,7 @@ jobs:
4949
- "${{ github.event.inputs.image }}"
5050

5151
steps:
52-
- name: 'Start SSH session'
52+
- name: "Start SSH session"
5353
if: ${{ github.event.inputs.ssh-debugging == 'true' }}
5454
uses: luchihoratiu/debug-via-ssh@main
5555
with:
@@ -72,7 +72,7 @@ jobs:
7272
bundle env
7373
echo ::endgroup::
7474
75-
- name: 'Provision test cluster'
75+
- name: "Provision test cluster"
7676
timeout-minutes: 15
7777
run: |
7878
echo ::group::prepare
@@ -99,7 +99,7 @@ jobs:
9999
sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
100100
echo ::endgroup::
101101
102-
- name: 'Install PE on test cluster'
102+
- name: "Install PE on test cluster"
103103
timeout-minutes: 120
104104
run: |
105105
bundle exec bolt plan run peadm_spec::install_test_cluster \
@@ -108,26 +108,26 @@ jobs:
108108
architecture=${{ matrix.architecture }} \
109109
version=${{ matrix.version }}
110110
111-
- name: 'Wait as long as the file ${HOME}/pause file is present'
111+
- name: "Wait as long as the file ${HOME}/pause file is present"
112112
if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
113113
run: |
114114
while [ -f "${HOME}/pause" ] ; do
115115
echo "${HOME}/pause present, sleeping for 60 seconds..."
116116
sleep 60
117-
done
117+
done
118118
echo "${HOME}/pause absent, continuing workflow."
119119
120-
- name: 'Activate twingate to obtain unreleased build'
121-
uses: timidri/twingate-github-action@main
120+
- name: "Activate twingate to obtain unreleased build"
121+
uses: comfucios/twingate-github-action@main
122122
with:
123123
service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
124124

125-
- name: 'Get latest build name'
125+
- name: "Get latest build name"
126126
id: latest
127127
run: |
128128
echo "::set-output name=ver::$(curl -q https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/main/ci-ready/LATEST)"
129129
130-
- name: 'Upgrade PE on test cluster'
130+
- name: "Upgrade PE on test cluster"
131131
timeout-minutes: 120
132132
run: |
133133
bundle exec bolt plan run peadm_spec::upgrade_test_cluster \
@@ -138,7 +138,7 @@ jobs:
138138
architecture=${{ matrix.architecture }} \
139139
pe_installer_source="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/main/ci-ready/puppet-enterprise-${{ steps.latest.outputs.ver }}-el-8-x86_64.tar"
140140
141-
- name: 'Tear down test cluster'
141+
- name: "Tear down test cluster"
142142
if: ${{ always() }}
143143
continue-on-error: true
144144
run: |

0 commit comments

Comments
 (0)