Skip to content

Commit 088ca53

Browse files
committed
remove mariadb pod creation + testing
1 parent 0c1f8f0 commit 088ca53

File tree

3 files changed

+6
-32
lines changed

3 files changed

+6
-32
lines changed

.github/workflows/cloudpod_release.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ permissions:
1616
name: Create Release
1717
jobs:
1818
build:
19-
strategy:
20-
matrix:
21-
database-type: [mysql, mariadb]
2219
uses: ./.github/workflows/setup.yml
2320
secrets: inherit
2421
with:
2522
store-cloudpod: "true"
26-
database-type: ${{ matrix.database-type }}
2723
localstack-version: ${{ inputs.release-tag || 'latest'}}
2824
upload:
2925
needs: build
@@ -41,13 +37,8 @@ jobs:
4137
- name: Prepare Release Notes
4238
run: |
4339
echo "This release includes the Cloud Pod of the sample created with LocalStack Version \`${{ inputs.release-tag || 'latest'}}\`." > Release.txt
44-
echo "Please use the \`release-pod-{database}.zip\` you need for your configuration." >> Release.txt
45-
echo "### MariaDB" >> Release.txt
46-
echo "By default LocalStack uses the engine \`mariadb\`, so you need \`release-pod-mariadb.zip\`." >> Release.txt
47-
echo "You can click the Launchpad to inject the pod into your running LocalStack instance:" >> Release.txt
48-
echo "[![LocalStack Pods Launchpad](https://localstack.cloud/gh/launch-pod-badge.svg)](https://app.localstack.cloud/launchpad?url=https://github.com/$GITHUB_REPOSITORY/releases/download/${{ inputs.release-tag || 'latest'}}/release-pod-mariadb.zip)" >> Release.txt
4940
echo "### MySQL" >> Release.txt
50-
echo "If you start LocalStack with \`RDS_MYSQL_DOCKER=1\`, please use the \`mysql\` pod \`release-pod-mysql.zip\`" >> Release.txt
41+
echo "The pod was created with `mysql` engine." >> Release.txt
5142
echo "You can click the Launchpad to inject the \`mysql\` version of the pod into your running LocalStack instance:" >> Release.txt
5243
echo "[![LocalStack Pods Launchpad](https://localstack.cloud/gh/launch-pod-badge.svg)](https://app.localstack.cloud/launchpad?url=https://github.com/$GITHUB_REPOSITORY/releases/download/${{ inputs.release-tag || 'latest'}}/release-pod-mysql.zip)" >> Release.txt
5344
@@ -59,5 +50,4 @@ jobs:
5950
name: "Cloud Pod for LocalStack Version '${{ inputs.release-tag || 'latest'}}'"
6051
body_path: ./Release.txt
6152
files: |
62-
./release-pod-mysql.zip
63-
./release-pod-mariadb.zip
53+
./release-pod-mysql.zip

.github/workflows/setup.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ on:
55
store-cloudpod:
66
required: true
77
type: string
8-
database-type:
9-
required: true
10-
type: string
118
localstack-version:
129
required: true
1310
type: string
@@ -38,17 +35,12 @@ jobs:
3835
env:
3936
LOCALSTACK_API_KEY: ${{ secrets.LOCALSTACK_API_KEY }}
4037
LOCALSTACK_VOLUME_DIR: ${{ github.workspace }}/ls_test
41-
MYSQL_FEATURE_FLAG: ${{ inputs.database-type }}
4238
run: |
4339
mkdir ls_test
4440
ls -la ls_test
4541
docker pull localstack/localstack-pro:${{ inputs.localstack-version }}
4642
# Start LocalStack in the background
47-
if [ "mysql" == ${MYSQL_FEATURE_FLAG} ]; then
48-
LS_LOG=trace RDS_MYSQL_DOCKER=1 localstack start -d
49-
else
50-
LS_LOG=trace localstack start -d
51-
fi
43+
LS_LOG=trace localstack start -d
5244
# Wait 30 seconds for the LocalStack container to become ready before timing out
5345
echo "Waiting for LocalStack startup..."
5446
localstack wait -t 30
@@ -73,13 +65,13 @@ jobs:
7365
if: ${{ inputs.store-cloudpod == 'true' }}
7466
uses: HarshCasper/cloud-pod-save@v0.1.0
7567
with:
76-
name: 'release-pod-${{ inputs.database-type }}.zip'
68+
name: 'release-pod-mysql.zip'
7769
location: 'disk'
7870

7971
- name: Upload Pod as Artifact
8072
if: ${{ inputs.store-cloudpod == 'true' }}
8173
uses: actions/upload-artifact@v3
8274
with:
8375
name: cloudpod
84-
path: release-pod-${{ inputs.database-type }}.zip
76+
path: release-pod-mysql.zip
8577
retention-days: 1

.github/workflows/test_cloudpods.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ jobs:
2929
runs-on: ubuntu-latest
3030
strategy:
3131
fail-fast: false
32-
matrix:
33-
tag: ${{ fromJson(needs.get-releases.outputs.matrix) }}
34-
db: ['mariadb', 'mysql']
3532
steps:
3633
# checkout to run the smoke-test.sh
3734
- name: Checkout
@@ -62,19 +59,14 @@ jobs:
6259
env:
6360
LOCALSTACK_API_KEY: ${{ secrets.LOCALSTACK_API_KEY }}
6461
LOCALSTACK_VOLUME_DIR: ${{ github.workspace }}/ls_test
65-
MYSQL_FEATURE_FLAG: ${{ matrix.db }}
6662
DEBUG: 1
6763
POD_LOAD_CLI_TIMEOUT: 300
6864
run: |
6965
mkdir ls_test
7066
ls -la ls_test
7167
docker pull localstack/localstack-pro:${{ matrix.tag }}
7268
# Start LocalStack in the background
73-
if [ "mysql" == ${MYSQL_FEATURE_FLAG} ]; then
74-
RDS_MYSQL_DOCKER=1 localstack start -d
75-
else
76-
localstack start -d
77-
fi
69+
localstack start -d
7870
# Wait 30 seconds for the LocalStack container to become ready before timing out
7971
echo "Waiting for LocalStack startup..."
8072
localstack wait -t 30

0 commit comments

Comments
 (0)