Skip to content

Commit 50a9c88

Browse files
RaunakJalanRaunakJalan
authored
Fixing sbcli command issue for branches (#160)
* Fixing sbcli command issue for branches * Fixing sbcli command issue for branches
1 parent 9353e2d commit 50a9c88

File tree

2 files changed

+49
-12
lines changed

2 files changed

+49
-12
lines changed

‎.github/workflows/e2e.yaml

+24-4
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,26 @@ jobs:
108108
run: |
109109
cd $GITHUB_WORKSPACE/simplyBlockDeploy
110110
terraform workspace select -or-create ghiaction-sbclie2e
111+
111112
- name: Validate Terraform Configuration
112113
run: |
113114
cd $GITHUB_WORKSPACE/simplyBlockDeploy
114115
terraform validate
116+
117+
- name: Set SBCLI_CMD based on branch and input
118+
run: |
119+
if [[ "${GITHUB_REF##*/}" == *"pre-release"* ]]; then
120+
echo "Branch is pre-release. Setting SBCLI_CMD to sbcli-pre."
121+
echo "SBCLI_CMD=sbcli-pre" >> $GITHUB_ENV
122+
elif [[ "${GITHUB_REF##*/}" == "sbcli" ]]; then
123+
echo "Branch is sbcli. Setting SBCLI_CMD to sbcli."
124+
echo "SBCLI_CMD=sbcli" >> $GITHUB_ENV
125+
else
126+
echo "Setting SBCLI_CMD to input or default to sbcli-dev."
127+
echo "SBCLI_CMD=${{ github.event.inputs.sbcli_cmd || 'sbcli-dev' }}" >> $GITHUB_ENV
128+
fi
129+
shell: bash
130+
115131
- name: Plan Terraform Changes
116132
run: |
117133
cd $GITHUB_WORKSPACE/simplyBlockDeploy
@@ -120,7 +136,9 @@ jobs:
120136
-var mgmt_nodes_instance_type="m6id.xlarge" -var storage_nodes_instance_type="m6i.xlarge" \
121137
-var "extra_nodes=1" -var "extra_nodes_instance_type=m6id.xlarge" \
122138
-var storage_nodes_ebs_size2=100 -var "region=us-east-2" \
123-
-var "sbcli_cmd=${{ github.event.inputs.sbcli_cmd || 'sbcli-dev' }}" -out=tfplan
139+
-var "sbcli_cmd=$SBCLI_CMD" -out=tfplan
140+
env:
141+
SBCLI_CMD: ${{ env.SBCLI_CMD }}
124142

125143
- name: Apply Terraform Changes
126144
run: |
@@ -139,7 +157,7 @@ jobs:
139157
- name: Bootstrap Cluster
140158
run: |
141159
cd $GITHUB_WORKSPACE/simplyBlockDeploy
142-
./bootstrap-cluster.sh --sbcli-cmd "${{ github.event.inputs.sbcli_cmd }}" \
160+
./bootstrap-cluster.sh --sbcli-cmd "$SBCLI_CMD" \
143161
--max-lvol 10 --max-snap 10 --max-prov 900G --number-of-devices 3 \
144162
--distr-ndcs ${{ github.event.inputs.ndcs || 1 }} \
145163
--distr-npcs ${{ github.event.inputs.npcs || 1 }} \
@@ -148,7 +166,7 @@ jobs:
148166
--spdk-debug
149167
id: bootstrap_cluster
150168
env:
151-
SBCLI_CMD: ${{ github.event.inputs.sbcli_cmd || 'sbcli-dev' }}
169+
SBCLI_CMD: ${{ env.SBCLI_CMD }}
152170

153171
- name: Record Test Start Time
154172
run: echo "TEST_START_TIME=$(date +%s)" >> $GITHUB_ENV
@@ -171,12 +189,14 @@ jobs:
171189
export AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
172190
export AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}
173191
export AWS_REGION=${{ secrets.AWS_REGION }}
174-
export SBCLI_CMD=${{ github.event.inputs.sbcli_cmd || 'sbcli-dev' }}
192+
export SBCLI_CMD=${SBCLI_CMD}
175193
TESTNAME=""
176194
if [ -n "${{ github.event.inputs.testname }}" ]; then
177195
TESTNAME="--testname ${{ github.event.inputs.testname }}"
178196
fi
179197
python3 e2e.py $TESTNAME
198+
env:
199+
SBCLI_CMD: ${{ env.SBCLI_CMD }}
180200

181201
- name: Record Test End Time
182202
if: always()

‎.github/workflows/k8s-e2e.yaml

+25-8
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,20 @@ jobs:
136136
run: |
137137
cd $GITHUB_WORKSPACE/simplyBlockDeploy
138138
terraform validate
139+
140+
- name: Set SBCLI_CMD based on branch and input
141+
run: |
142+
if [[ "${GITHUB_REF##*/}" == *"pre-release"* ]]; then
143+
echo "Branch is pre-release. Setting SBCLI_CMD to sbcli-pre."
144+
echo "SBCLI_CMD=sbcli-pre" >> $GITHUB_ENV
145+
elif [[ "${GITHUB_REF##*/}" == "sbcli" ]]; then
146+
echo "Branch is sbcli. Setting SBCLI_CMD to sbcli."
147+
echo "SBCLI_CMD=sbcli" >> $GITHUB_ENV
148+
else
149+
echo "Setting SBCLI_CMD to input or default to sbcli-dev."
150+
echo "SBCLI_CMD=${{ github.event.inputs.sbcli_cmd || 'sbcli-dev' }}" >> $GITHUB_ENV
151+
fi
152+
shell: bash
139153

140154
- name: Plan Terraform Changes
141155
run: |
@@ -147,7 +161,9 @@ jobs:
147161
-var "extra_nodes=1" -var "extra_nodes_instance_type=m6gd.xlarge" \
148162
-var storage_nodes_ebs_size2=100 -var "region=us-east-2" \
149163
-var "extra_nodes_arch=arm64" \
150-
-var "sbcli_cmd=${{ github.event.inputs.sbcli_cmd || 'sbcli-dev' }}" -out=tfplan
164+
-var "sbcli_cmd=$SBCLI_CMD" -out=tfplan
165+
env:
166+
SBCLI_CMD: ${{ env.SBCLI_CMD }}
151167

152168
- name: Apply Terraform Changes
153169
run: |
@@ -170,19 +186,16 @@ jobs:
170186
- name: Bootstrap Cluster
171187
run: |
172188
cd $GITHUB_WORKSPACE/simplyBlockDeploy
173-
echo "Sleeping for 30 seconds before bootstrap-cluster"
174-
sleep 30
175-
./bootstrap-cluster.sh --sbcli-cmd "${{ github.event.inputs.sbcli_cmd }}" \
189+
./bootstrap-cluster.sh --sbcli-cmd "$SBCLI_CMD" \
176190
--max-lvol 10 --max-snap 10 --max-prov 900G --number-of-devices 3 \
177191
--distr-ndcs ${{ github.event.inputs.ndcs || 1 }} \
178192
--distr-npcs ${{ github.event.inputs.npcs || 1 }} \
179193
--distr-bs ${{ github.event.inputs.bs || 4096 }} \
180194
--distr-chunk-bs ${{ github.event.inputs.chunk_bs || 4096 }} \
181-
--k8s-snode \
182195
--spdk-debug
183196
id: bootstrap_cluster
184197
env:
185-
SBCLI_CMD: ${{ github.event.inputs.sbcli_cmd || 'sbcli-dev' }}
198+
SBCLI_CMD: ${{ env.SBCLI_CMD }}
186199

187200
- name: Bootstrap k3s
188201
run: |
@@ -260,8 +273,10 @@ jobs:
260273
ssh -i "$HOME/.ssh/${{ steps.terraform_outputs.outputs.key_name }}" -o StrictHostKeyChecking=no \
261274
-o ProxyCommand="ssh -o StrictHostKeyChecking=no -i \"$HOME/.ssh/${{ steps.terraform_outputs.outputs.key_name }}\" -W %h:%p ec2-user@${{ steps.terraform_outputs.outputs.bastion_public_ip }}" \
262275
ec2-user@${{ steps.terraform_outputs.outputs.mgmt_private_ip }} "
263-
${{ github.event.inputs.sbcli_cmd }} cluster activate ${{ steps.bootstrap_cluster.outputs.cluster_id }}
276+
$SBCLI_CMD cluster activate ${{ steps.bootstrap_cluster.outputs.cluster_id }}
264277
"
278+
env:
279+
SBCLI_CMD: ${{ env.SBCLI_CMD }}
265280

266281
- name: Record Test Start Time
267282
run: echo "TEST_START_TIME=$(date +%s)" >> $GITHUB_ENV
@@ -284,7 +299,7 @@ jobs:
284299
export AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
285300
export AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}
286301
export AWS_REGION=${{ secrets.AWS_REGION }}
287-
export SBCLI_CMD=${{ github.event.inputs.sbcli_cmd || 'sbcli-dev' }}
302+
export SBCLI_CMD=${SBCLI_CMD}
288303
TESTNAME=""
289304
if [ -n "${{ github.event.inputs.testname }}" ]; then
290305
TESTNAME="--testname ${{ github.event.inputs.testname }}"
@@ -296,6 +311,8 @@ jobs:
296311
--chunk_bs "${{ github.event.inputs.chunk_bs }}" \
297312
--run_k8s True
298313
$TESTNAME
314+
env:
315+
SBCLI_CMD: ${{ env.SBCLI_CMD }}
299316

300317
- name: Record Test End Time
301318
if: always()

0 commit comments

Comments
 (0)