Skip to content

Commit 27719e8

Browse files
authored
chore(ci): change s3 bucket used in tests (#3206)
* chore(ci): change s3 bucket used in tests * misspelling * fix
1 parent cc85f17 commit 27719e8

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

.github/actions/e2e/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ runs:
7575
export REPLICATED_API_TOKEN=${{ inputs.cmx-api-token }}
7676
export DR_S3_ENDPOINT=https://s3.amazonaws.com
7777
export DR_S3_REGION=us-east-1
78-
export DR_S3_BUCKET=kots-testim-snapshots
78+
export DR_S3_BUCKET=embedded-cluster-e2e-snapshots
7979
export DR_S3_PREFIX=${{ inputs.test-name }}-${{ github.run_id }}-${{ github.run_attempt }}
8080
export DR_S3_PREFIX_AIRGAP=${{ inputs.test-name }}-${{ github.run_id }}-${{ github.run_attempt }}-airgap
8181
export DR_ACCESS_KEY_ID=${{ inputs.dr-aws-access-key-id }}

.github/workflows/ci.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jobs:
180180
go-version-file: go.mod
181181
cache-dependency-path: "**/*.sum"
182182
- name: Free up runner disk space # this is much faster than .github/actions/free-disk-space
183-
run: |
183+
run: &free-disk-space |
184184
df -h
185185
sudo rm -rf \
186186
/usr/share/swift \
@@ -415,6 +415,9 @@ jobs:
415415
- name: Checkout
416416
uses: actions/checkout@v5
417417

418+
- name: Free up runner disk space # this is much faster than .github/actions/free-disk-space
419+
run: *free-disk-space
420+
418421
- name: Cache embedded bins
419422
uses: actions/cache@v4
420423
with:
@@ -568,6 +571,9 @@ jobs:
568571
- name: Checkout
569572
uses: actions/checkout@v5
570573

574+
- name: Free up runner disk space # this is much faster than .github/actions/free-disk-space
575+
run: *free-disk-space
576+
571577
- name: Cache embedded bins
572578
uses: actions/cache@v4
573579
with:
@@ -905,7 +911,7 @@ jobs:
905911
SHORT_SHA: dev-${{ needs.output-vars.outputs.git_sha }}
906912
DR_S3_ENDPOINT: https://s3.amazonaws.com
907913
DR_S3_REGION: us-east-1
908-
DR_S3_BUCKET: kots-testim-snapshots
914+
DR_S3_BUCKET: embedded-cluster-e2e-snapshots
909915
DR_S3_PREFIX: ${{ matrix.test }}-${{ github.run_id }}-${{ github.run_attempt }}
910916
DR_S3_PREFIX_AIRGAP: ${{ matrix.test }}-${{ github.run_id }}-${{ github.run_attempt }}-airgap
911917
DR_ACCESS_KEY_ID: ${{ secrets.TESTIM_AWS_ACCESS_KEY_ID }}

.github/workflows/release-prod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ jobs:
533533
SHORT_SHA: ${{ github.ref_name }}
534534
DR_S3_ENDPOINT: https://s3.amazonaws.com
535535
DR_S3_REGION: us-east-1
536-
DR_S3_BUCKET: kots-testim-snapshots
536+
DR_S3_BUCKET: embedded-cluster-e2e-snapshots
537537
DR_S3_PREFIX: ${{ matrix.test }}-${{ github.run_id }}-${{ github.run_attempt }}
538538
DR_S3_PREFIX_AIRGAP: ${{ matrix.test }}-${{ github.run_id }}-${{ github.run_attempt }}-airgap
539539
DR_ACCESS_KEY_ID: ${{ secrets.TESTIM_AWS_ACCESS_KEY_ID }}

cmd/installer/cli/reset.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func ResetCmd(ctx context.Context, appTitle string) *cobra.Command {
133133
}
134134

135135
// try and leave etcd cluster
136-
currentHost.leaveEtcdcluster()
136+
currentHost.leaveEtcdCluster()
137137
}
138138
}
139139

@@ -337,8 +337,8 @@ type etcdMembers struct {
337337
Members map[string]string `json:"members"`
338338
}
339339

340-
// leaveEtcdcluster uses k0s to attempt to leave the etcd cluster
341-
func (h *hostInfo) leaveEtcdcluster() {
340+
// leaveEtcdCluster uses k0s to attempt to leave the etcd cluster
341+
func (h *hostInfo) leaveEtcdCluster() {
342342
// Check if k0s binary exists
343343
if _, err := os.Stat(k0sBinPath); os.IsNotExist(err) {
344344
logrus.Debugf("k0s binary not found at %s, skipping etcd leave", k0sBinPath)

0 commit comments

Comments
 (0)