Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Faster windows test #1886

Merged
merged 1 commit into from Feb 24, 2019
Merged

Faster windows test #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions agent/engine/engine_windows_integ_test.go
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ func isDockerRunning() bool { return true }
func createTestContainer() *apicontainer.Container {
return &apicontainer.Container{
Name: "windows",
Image: "microsoft/windowsservercore:latest",
Image: "microsoft/windowsservercore",
Essential: true,
DesiredStatusUnsafe: apicontainerstatus.ContainerRunning,
CPU: 512,
Expand Down Expand Up @@ -96,7 +96,7 @@ func createTestHealthCheckTask(arn string) *apitask.Task {
DesiredStatusUnsafe: apitaskstatus.TaskRunning,
Containers: []*apicontainer.Container{createTestContainer()},
}
testTask.Containers[0].Image = "microsoft/nanoserver:latest"
testTask.Containers[0].Image = "microsoft/nanoserver"
testTask.Containers[0].Name = "test-health-check"
testTask.Containers[0].HealthCheckType = "docker"
testTask.Containers[0].Command = []string{"powershell", "-command", "Start-Sleep -s 300"}
Expand Down
81 changes: 55 additions & 26 deletions agent/engine/ordering_integ_test.go
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ import (

apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
"github.com/aws/aws-sdk-go/aws"
"time"
)

// TestDependencyHealthCheck is a happy-case integration test that considers a workflow with a HEALTHY dependency
Expand Down Expand Up @@ -57,15 +58,21 @@ func TestDependencyHealthCheck(t *testing.T) {

go taskEngine.AddTask(testTask)

// Both containers should start
verifyContainerRunningStateChange(t, taskEngine)
verifyContainerRunningStateChange(t, taskEngine)
verifyTaskIsRunning(stateChangeEvents, testTask)
finished := make(chan interface{})
go func() {
// Both containers should start
verifyContainerRunningStateChange(t, taskEngine)
verifyContainerRunningStateChange(t, taskEngine)
verifyTaskIsRunning(stateChangeEvents, testTask)

// Task should stop all at once
verifyContainerStoppedStateChange(t, taskEngine)
verifyContainerStoppedStateChange(t, taskEngine)
verifyTaskIsStopped(stateChangeEvents, testTask)
// Task should stop all at once
verifyContainerStoppedStateChange(t, taskEngine)
verifyContainerStoppedStateChange(t, taskEngine)
verifyTaskIsStopped(stateChangeEvents, testTask)
close(finished)
}()

waitFinished(t, finished, 90*time.Second)

}

Expand Down Expand Up @@ -103,17 +110,23 @@ func TestDependencyComplete(t *testing.T) {

go taskEngine.AddTask(testTask)

// First container should run to completion and then exit
verifyContainerRunningStateChange(t, taskEngine)
verifyContainerStoppedStateChange(t, taskEngine)
finished := make(chan interface{})

// Second container starts after the first stops, task becomes running
verifyContainerRunningStateChange(t, taskEngine)
verifyTaskIsRunning(stateChangeEvents, testTask)
go func() {
// First container should run to completion and then exit
verifyContainerRunningStateChange(t, taskEngine)
verifyContainerStoppedStateChange(t, taskEngine)

// Last container stops and then the task stops
verifyContainerStoppedStateChange(t, taskEngine)
verifyTaskIsStopped(stateChangeEvents, testTask)
// Second container starts after the first stops, task becomes running
verifyContainerRunningStateChange(t, taskEngine)
verifyTaskIsRunning(stateChangeEvents, testTask)

// Last container stops and then the task stops
verifyContainerStoppedStateChange(t, taskEngine)
verifyTaskIsStopped(stateChangeEvents, testTask)
}()

waitFinished(t, finished, 90*time.Second)
}

// TestDependencySuccess validates that the SUCCESS dependency condition will resolve when the child container exits
Expand Down Expand Up @@ -150,17 +163,22 @@ func TestDependencySuccess(t *testing.T) {

go taskEngine.AddTask(testTask)

// First container should run to completion
verifyContainerRunningStateChange(t, taskEngine)
verifyContainerStoppedStateChange(t, taskEngine)
finished := make(chan interface{})
go func() {
// First container should run to completion
verifyContainerRunningStateChange(t, taskEngine)
verifyContainerStoppedStateChange(t, taskEngine)

// Second container starts after the first stops, task becomes running
verifyContainerRunningStateChange(t, taskEngine)
verifyTaskIsRunning(stateChangeEvents, testTask)
// Second container starts after the first stops, task becomes running
verifyContainerRunningStateChange(t, taskEngine)
verifyTaskIsRunning(stateChangeEvents, testTask)

// Last container stops and then the task stops
verifyContainerStoppedStateChange(t, taskEngine)
verifyTaskIsStopped(stateChangeEvents, testTask)
// Last container stops and then the task stops
verifyContainerStoppedStateChange(t, taskEngine)
verifyTaskIsStopped(stateChangeEvents, testTask)
}()

waitFinished(t, finished, 90*time.Second)
}

// TestDependencySuccess validates that the SUCCESS dependency condition will fail when the child exits 1. This is a
Expand Down Expand Up @@ -302,3 +320,14 @@ func TestDependencyHealthyTimeout(t *testing.T) {
// task should transition to stopped
verifyTaskIsStopped(stateChangeEvents, testTask)
}

func waitFinished(t *testing.T, finished <-chan interface{}, duration time.Duration) {
select {
case <-finished:
t.Log("Finished successfully.")
return
case <-time.After(90 * time.Second):
t.Error("timed out after: ", duration)
t.FailNow()
}
}
2 changes: 1 addition & 1 deletion agent/engine/ordering_integ_windows_test.go
View file
Open in desktop
Expand Up @@ -20,5 +20,5 @@ const (
)

var (
entryPointForOS = []string{"pwsh", "-c"}
entryPointForOS = []string{"powershell"}
)
2 changes: 1 addition & 1 deletion ...t/functional_tests/testdata/taskdefinitions/awslogs-datetime-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
"memory": 512,
"name": "awslogs-datetime-windows",
"cpu": 1024,
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"entryPoint": ["powershell"],
"command": ["echo", "\"May 01, 2017 19:00:01 ECS\nMay 01, 2017 19:00:04 Agent\nRunning\nin the instance\""],
"logConfiguration": {
Expand Down
2 changes: 1 addition & 1 deletion .../functional_tests/testdata/taskdefinitions/awslogs-multiline-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
"memory": 512,
"name": "awslogs-multiline-windows",
"cpu": 1024,
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"entryPoint": ["powershell"],
"command": ["echo", "\"INFO: ECS Agent\nRunning\nINFO: Instance\""],
"logConfiguration": {
Expand Down
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/awslogs-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
"memory": 512,
"name": "awslogs",
"cpu": 1024,
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"logConfiguration": {
"logDriver": "awslogs",
"options": {
Expand Down
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/cleanup-windows/task-definition.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"family": "ecsftest-cleanup-windows",
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "cleanup-windows",
"cpu": 1024,
"memory": 512,
Expand Down
2 changes: 1 addition & 1 deletion ...s/testdata/taskdefinitions/container-metadata-file-validator-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -24,4 +24,4 @@
}
}]
}


2 changes: 1 addition & 1 deletion ...nal_tests/testdata/taskdefinitions/container-metadata-file-validator/task-definition.json
View file
Open in desktop
Expand Up @@ -21,4 +21,4 @@
}
}]
}


6 changes: 3 additions & 3 deletions agent/functional_tests/testdata/taskdefinitions/datavolume-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
"host": {}
}],
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "exit",
"cpu": 512,
"memory": 256,
Expand All @@ -15,7 +15,7 @@
}],
"command": ["powershell", "-c", "while (1) { sleep 1; if (test-path \"C:/data/success\") { exit 42 }}; done"]
}, {
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "dataSource",
"cpu": 512,
"memory": 256,
Expand All @@ -25,7 +25,7 @@
}],
"command": ["powershell", "-c", "New-Item -ItemType file C:/data/success"]
}, {
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "data-volume-source",
"cpu": 512,
"memory": 256,
Expand Down
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/hostname-windows/task-definition.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"family": "ecsftest-hostname",
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "exit",
"cpu": 1024,
"memory": 512,
Expand Down
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/labels-windows/task-definition.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"family": "ecsftest-labels-windows",
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "labeled",
"cpu": 1024,
"memory": 512,
Expand Down
2 changes: 1 addition & 1 deletion ...functional_tests/testdata/taskdefinitions/logdriver-jsonfile-windows/task-definition.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"family": "ecsinteg-json-file-rollover",
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "exit",
"memory": 512,
"cpu": 1024,
Expand Down
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/network-mode-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"family": "ecsftest-networkmode",
"networkMode": "$$$$NETWORK_MODE$$$$",
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"entryPoint": ["powershell"],
"command": ["sleep", "60"],
"name": "network-$$$$NETWORK_MODE$$$$",
Expand Down
4 changes: 2 additions & 2 deletions agent/functional_tests/testdata/taskdefinitions/oom-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@
"memory": 256,
"name": "memory-overcommit",
"cpu": 512,
"image": "amazon/amazon-ecs-windows-python:make",
"command": ["python", "-c", "import time; time.sleep(30); foo=' '*1024*1024*1024;"]
"image": "amazon/amazon-ecs-windows-telemetry-test:make",
"command": ["-concurrency", "10", "-memory", "1024"]
}]
}

2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/savedstate-windows/task-definition.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"family": "ecsftest-savedstate-windows",
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "savedstate-windows",
"cpu": 1024,
"memory": 512,
Expand Down
2 changes: 1 addition & 1 deletion ...ctional_tests/testdata/taskdefinitions/secrets-environment-variables/task-definition.json
View file
Open in desktop
Expand Up @@ -17,4 +17,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/simple-exit-windows/task-definition.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"family": "ecsinteg-simple-exit-windows",
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "exit",
"cpu": 1024,
"memory": 512,
Expand Down
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/task-elastic-inference/task-definition.json
View file
Open in desktop
Expand Up @@ -23,4 +23,4 @@
"deviceType": "eia1.medium"
}
]
}
}
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/task-local-vol-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"family": "ecsftest-task-local-volume",
"containerDefinitions": [
{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "exit",
"cpu": 512,
"memory": 256,
Expand Down
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/task-local-vol/task-definition.json
View file
Open in desktop
Expand Up @@ -32,4 +32,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion ...nctional_tests/testdata/taskdefinitions/task-shared-vol-read-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
"containerDefinitions": [
{
"name": "task-shared-vol-read",
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"cpu": 512,
"memory": 256,
"essential": true,
Expand Down
2 changes: 1 addition & 1 deletion ...ctional_tests/testdata/taskdefinitions/task-shared-vol-write-windows/task-definition.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"family": "ecsftest-task-local-volume",
"containerDefinitions": [
{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "task-shared-vol-write-windows",
"cpu": 512,
"memory": 256,
Expand Down
2 changes: 1 addition & 1 deletion agent/functional_tests/testdata/taskdefinitions/working-dir-windows/task-definition.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"family": "ecsftest-working-dir-windows",
"containerDefinitions": [{
"image": "microsoft/windowsservercore:latest",
"image": "microsoft/windowsservercore",
"name": "exit",
"cpu": 1024,
"memory": 512,
Expand Down
2 changes: 1 addition & 1 deletion misc/container-health-windows/windows.dockerfile
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
FROM microsoft/windowsservercore:latest
FROM microsoft/windowsservercore

MAINTAINER Amazon Web Services, Inc.

Expand Down
2 changes: 1 addition & 1 deletion ...iner-metadata-file-validator-windows/container-metadata-file-validator-windows.dockerfile
View file
Open in desktop
Expand Up @@ -11,6 +11,6 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.

FROM microsoft/nanoserver:latest
FROM microsoft/windowsservercore

ADD container-metadata-file-validator-windows.exe container-metadata-file-validator-windows.exe
18 changes: 1 addition & 17 deletions misc/container-metadata-file-validator-windows/setup-container-metadata-file-validator.ps1
View file
Open in desktop
Expand Up @@ -14,23 +14,7 @@
$oldPref = $ErrorActionPreference
$ErrorActionPreference = 'Stop'

Invoke-Expression ${PSScriptRoot}\..\windows-deploy\hostsetup.ps1

# Create amazon/amazon-ecs-container-metadata-file-validator-windows for tests
$buildscript = @"
mkdir C:\md
cp C:\ecs\container-metadata-file-validator-windows.go C:\md
go build -o C:\md\container-metadata-file-validator-windows.exe C:\md\container-metadata-file-validator-windows.go
cp C:\md\container-metadata-file-validator-windows.exe C:\ecs
"@

$buildimage="golang:1.7-nanoserver"
docker pull $buildimage

docker run `
--volume ${PSScriptRoot}:C:\ecs `
$buildimage `
powershell ${buildscript}

Invoke-Expression "go build -o ${PSScriptRoot}\container-metadata-file-validator-windows.exe ${PSScriptRoot}\container-metadata-file-validator-windows.go"
Invoke-Expression "docker build -t amazon/amazon-ecs-container-metadata-file-validator-windows --file ${PSScriptRoot}\container-metadata-file-validator-windows.dockerfile ${PSScriptRoot}"
$ErrorActionPreference = $oldPref
2 changes: 1 addition & 1 deletion misc/image-cleanup-test-images/windows0.dockerfile
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
FROM microsoft/windowsservercore:latest
FROM microsoft/windowsservercore

MAINTAINER Amazon Web Services, Inc.

Expand Down