Skip to content

Commit 4a5080e

Browse files
authored
Create integration test image only from master (#947)
Follow up for #943
1 parent d0177b6 commit 4a5080e

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/docker-it.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
name: Docker image for integration tests
1+
name: Image for integration tests
22

33
on:
4-
pull_request:
5-
types: [opened, synchronize]
64
push:
75
branches: [master]
86

scripts/it.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ if [[ $@ == *"--debug"* ]]; then
77
echo "[*] To see debug logs: tail -f $PWD/tf.log"
88
fi
99

10-
TEST_FILTER=${1:-TestAcc}
10+
if [ "" == "$TEST_FILTER" ]; then
11+
TEST_FILTER="TestAcc"
12+
fi
13+
14+
export TMPDIR=/tmp
15+
export TF_ACC=1
1116

12-
TMPDIR=/tmp TF_ACC=1 gotestsum \
13-
--format short-verbose \
17+
gotestsum --format short-verbose \
1418
--raw-command go test -v -json \
1519
-test.timeout 30m \
1620
-run $TEST_FILTER ./... 2>&1 | tee out.log
@@ -19,7 +23,7 @@ FAILURES=$(grep "\-\-\- FAIL" out.log | sed 's/--- FAIL: / \* \[ \] /g' | sort)
1923
PASSES=$(grep PASS out.log | grep Test | sort | sed 's/PASS/ \* \[x\]/')
2024

2125
cat <<-EOF > test-report.log
22-
$TEST_FILTER
26+
Test run: $TEST_FILTER
2327
---
2428
${FAILURES}
2529
${PASSES}

scripts/nightly/azureit.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ resource "azurerm_container_group" "this" {
248248

249249
container {
250250
name = "acceptance"
251-
image = "ghcr.io/databrickslabs/terraform-provider-it:pr-943"
251+
image = "ghcr.io/databrickslabs/terraform-provider-it:master"
252252
cpu = "2"
253253
memory = "2"
254254
environment_variables = {

0 commit comments

Comments
 (0)