Skip to content

Commit 205165e

Browse files
committed
CI: remove unused conditional from acceptance_test
1 parent 6f850c8 commit 205165e

File tree

4 files changed

+2
-14
lines changed

4 files changed

+2
-14
lines changed

acceptance_test/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ You can create a `config.json` file, eg:
2424
"vm_extensions": "<comma separated string of options, e.g. 50GB_ephemeral_disk>",
2525
"network": "<network from bosh cloud config>",
2626
"skip_cleanup": "<skip cleanup - if this is false all unused stemcells are deleted>"
27-
"skip_ms_update_test": "<skip check-updates errand - if true, it will not test that all Windows updates are installed>",
2827
"ssh_disabled_by_default": "check ssh daemon default startup type - if true then it checks that the startup type is DISABLED. If false or missing, checks startup type is AUTOMATIC",
2928
"security_compliance_applied": "check that Microsoft Baseline policies have been applied"
3029
}

acceptance_test/main_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,8 @@ var _ = Describe("BOSH Windows", func() {
147147
})
148148

149149
It("is fully updated", func() { // 860s
150-
if testConfig.SkipMSUpdateTest {
151-
Skip("Skipping check-updates test - SkipMSUpdateTest set to true")
152-
} else {
153-
err := boshCommand.RunErrand("check-updates", deploymentName)
154-
Expect(err).NotTo(HaveOccurred())
155-
}
150+
err := boshCommand.RunErrand("check-updates", deploymentName)
151+
Expect(err).NotTo(HaveOccurred())
156152
})
157153

158154
It("has all certificate authority certs that are present on the Windows Update Server", func() {
@@ -227,7 +223,6 @@ type TestConfig struct {
227223
DefaultPassword string `json:"default_password"`
228224
SkipCleanup bool `json:"skip_cleanup"`
229225
MountEphemeralDisk bool `json:"mount_ephemeral_disk"`
230-
SkipMSUpdateTest bool `json:"skip_ms_update_test"`
231226
SSHDisabledByDefault bool `json:"ssh_disabled_by_default"`
232227
SecurityComplianceApplied bool `json:"security_compliance_applied"`
233228
}

ci/tasks/run-bwats/run

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ if [ "$SSH_DISABLED_BY_DEFAULT" != "true" ] ; then
1919
SSH_DISABLED_BY_DEFAULT="false"
2020
fi
2121

22-
if [ "$SKIP_MS_UPDATE_TEST" != "true" ] ; then
23-
SKIP_MS_UPDATE_TEST="false"
24-
fi
25-
2622
if [ "$SECURITY_COMPLIANCE_APPLIED" != "true" ] ; then
2723
SECURITY_COMPLIANCE_APPLIED="false"
2824
fi
@@ -48,7 +44,6 @@ pushd stemcell-builder/acceptance_test
4844
"ssh_disabled_by_default": $SSH_DISABLED_BY_DEFAULT,
4945
"default_username" : "$DEFAULT_USERNAME",
5046
"default_password" : "$DEFAULT_PASSWORD",
51-
"skip_ms_update_test": $SKIP_MS_UPDATE_TEST,
5247
"security_compliance_applied": $SECURITY_COMPLIANCE_APPLIED
5348
}
5449
END_OF_CONFIG

ci/tasks/run-bwats/task.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ params:
2020
GINKGO_SKIP:
2121
IAAS:
2222
NETWORK: default
23-
SKIP_MS_UPDATE_TEST: false
2423
SSH_DISABLED_BY_DEFAULT: false
2524
SSH_TUNNEL_IP:
2625
SSH_TUNNEL_PRIVATE_KEY:

0 commit comments

Comments
 (0)