Skip to content

Commit 3190233

Browse files
authored
Use AMI with socat installed. (#9719)
* Use AMI with socat installed with disk space increased up to 150 GB. * Also use the same kube acceptance test set up for the orchestrator.
1 parent 50005ca commit 3190233

File tree

1 file changed

+6
-26
lines changed

1 file changed

+6
-26
lines changed

.github/workflows/gradle.yml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ jobs:
305305
with:
306306
java-version: "17"
307307

308-
# octavia-cli install and testing requires Python.
309-
# We use 3.8 in this project because 3.7 is not supported on Apple M1.
308+
# octavia-cli install and testing requires Python.
309+
# We use 3.8 in this project because 3.7 is not supported on Apple M1.
310310
- uses: actions/setup-python@v2
311311
with:
312312
python-version: "3.8"
@@ -482,8 +482,8 @@ jobs:
482482
id: start-ec2-runner
483483
uses: ./.github/actions/start-aws-runner
484484
with:
485-
# github-self-hosted-runner-ubuntu-20-with-120gdisk-docker-20.10.7
486-
ec2-image-id: ami-0d4083c04fde515c4
485+
# github-self-hosted-runner-ubuntu-20-with-150gdisk-docker-20.10.7-and-socat
486+
ec2-image-id: ami-0c1a9bc22624339d8
487487
aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
488488
aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
489489
github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN }}
@@ -523,16 +523,6 @@ jobs:
523523
org.gradle.vfs.watch=false
524524
EOF
525525
526-
- name: Install socat (required for port forwarding)
527-
run: |
528-
# wait to receive lock (see https://askubuntu.com/questions/132059/how-to-make-a-package-manager-wait-if-another-instance-of-apt-is-running)
529-
while sudo fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock >/dev/null 2>&1; do
530-
sleep 1
531-
done
532-
533-
sudo apt-get update
534-
sudo apt-get install socat
535-
536526
- name: Create cluster config file
537527
run: |
538528
cat > /tmp/kind-config.yaml <<EOF
@@ -644,8 +634,8 @@ jobs:
644634
id: start-ec2-runner
645635
uses: ./.github/actions/start-aws-runner
646636
with:
647-
# github-self-hosted-runner-ubuntu-20-with-120gdisk-docker-20.10.7
648-
ec2-image-id: ami-0d4083c04fde515c4
637+
# github-self-hosted-runner-ubuntu-20-with-150gdisk-docker-20.10.7-and-socat
638+
ec2-image-id: ami-0c1a9bc22624339d8
649639
aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
650640
aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
651641
github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN }}
@@ -685,16 +675,6 @@ jobs:
685675
org.gradle.vfs.watch=false
686676
EOF
687677
688-
- name: Install socat (required for port forwarding)
689-
run: |
690-
# wait to receive lock (see https://askubuntu.com/questions/132059/how-to-make-a-package-manager-wait-if-another-instance-of-apt-is-running)
691-
while sudo fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock >/dev/null 2>&1; do
692-
sleep 1
693-
done
694-
695-
sudo apt-get update
696-
sudo apt-get install socat
697-
698678
- name: Create cluster config file
699679
run: |
700680
cat > /tmp/kind-config.yaml <<EOF

0 commit comments

Comments
 (0)