Skip to content

Commit

Permalink
Update tests - add ImageStreams
Browse files Browse the repository at this point in the history
  • Loading branch information
@kadel
kadel committed Sep 26, 2016
1 parent 1dd8969 commit eb01743
Show file tree
Hide file tree
Showing 5 changed files with 761 additions and 215 deletions.
46 changes: 44 additions & 2 deletions script/test/fixtures/entrypoint-command/output-os.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,24 @@
"strategy": {
"resources": {}
},
"triggers": null,
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"base"
],
"from": {
"kind": "ImageStreamTag",
"name": "base:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
Expand All @@ -34,7 +51,7 @@
"containers": [
{
"name": "base",
"image": "busybox",
"image": " ",
"command": [
"echo"
],
Expand All @@ -49,6 +66,31 @@
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "base",
"creationTimestamp": null
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "busybox"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": {
"dockerImageRepository": ""
}
}
]
}
206 changes: 145 additions & 61 deletions script/test/fixtures/etherpad/output-os.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,34 @@
"metadata": {},
"items": [
{
"kind": "DeploymentConfig",
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null,
"labels": {
"service": "mariadb"
}
},
"spec": {
"ports": [
{
"name": "3306",
"protocol": "TCP",
"port": 3306,
"targetPort": 3306
}
],
"selector": {
"service": "mariadb"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "etherpad",
Expand All @@ -13,54 +40,94 @@
"service": "etherpad"
}
},
"spec": {
"ports": [
{
"name": "80",
"protocol": "TCP",
"port": 80,
"targetPort": 9001
}
],
"selector": {
"service": "etherpad"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null,
"labels": {
"service": "mariadb"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": null,
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"mariadb"
],
"from": {
"kind": "ImageStreamTag",
"name": "mariadb:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"service": "etherpad"
"service": "mariadb"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"service": "etherpad"
"service": "mariadb"
}
},
"spec": {
"containers": [
{
"name": "etherpad",
"image": "centos/etherpad",
"name": "mariadb",
"image": " ",
"ports": [
{
"containerPort": 9001,
"containerPort": 3306,
"protocol": "TCP"
}
],
"env": [
{
"name": "DB_USER",
"name": "MYSQL_DATABASE",
"value": "etherpad"
},
{
"name": "DB_DBID",
"name": "MYSQL_PASSWORD",
"value": "etherpad"
},
{
"name": "DB_HOST",
"value": "mariadb"
},
{
"name": "DB_PASS",
"name": "MYSQL_ROOT_PASSWORD",
"value": "etherpad"
},
{
"name": "DB_PORT",
"value": "3306"
"name": "MYSQL_USER",
"value": "etherpad"
}
],
"resources": {}
Expand All @@ -73,86 +140,105 @@
"status": {}
},
{
"kind": "Service",
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "etherpad",
"creationTimestamp": null,
"labels": {
"service": "etherpad"
}
"name": "mariadb",
"creationTimestamp": null
},
"spec": {
"ports": [
"tags": [
{
"name": "80",
"protocol": "TCP",
"port": 80,
"targetPort": 9001
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "centos/mariadb"
},
"generation": null,
"importPolicy": {}
}
],
"selector": {
"service": "etherpad"
}
]
},
"status": {
"loadBalancer": {}
"dockerImageRepository": ""
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "mariadb",
"name": "etherpad",
"creationTimestamp": null,
"labels": {
"service": "mariadb"
"service": "etherpad"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": null,
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"etherpad"
],
"from": {
"kind": "ImageStreamTag",
"name": "etherpad:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"service": "mariadb"
"service": "etherpad"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"service": "mariadb"
"service": "etherpad"
}
},
"spec": {
"containers": [
{
"name": "mariadb",
"image": "centos/mariadb",
"name": "etherpad",
"image": " ",
"ports": [
{
"containerPort": 3306,
"containerPort": 9001,
"protocol": "TCP"
}
],
"env": [
{
"name": "MYSQL_DATABASE",
"name": "DB_USER",
"value": "etherpad"
},
{
"name": "MYSQL_PASSWORD",
"name": "DB_DBID",
"value": "etherpad"
},
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "etherpad"
"name": "DB_HOST",
"value": "mariadb"
},
{
"name": "MYSQL_USER",
"name": "DB_PASS",
"value": "etherpad"
},
{
"name": "DB_PORT",
"value": "3306"
}
],
"resources": {}
Expand All @@ -165,30 +251,28 @@
"status": {}
},
{
"kind": "Service",
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null,
"labels": {
"service": "mariadb"
}
"name": "etherpad",
"creationTimestamp": null
},
"spec": {
"ports": [
"tags": [
{
"name": "3306",
"protocol": "TCP",
"port": 3306,
"targetPort": 3306
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "centos/etherpad"
},
"generation": null,
"importPolicy": {}
}
],
"selector": {
"service": "mariadb"
}
]
},
"status": {
"loadBalancer": {}
"dockerImageRepository": ""
}
}
]
Expand Down
Loading

0 comments on commit eb01743

Please sign in to comment.