Skip to content
This repository has been archived by the owner on Mar 24, 2023. It is now read-only.

fixing tests #1121

Merged
merged 1 commit into from
Jul 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration/base/amazon-eks/expected/.ship/state.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"v1": {
"config": {},
"contentSHA": "bc7239400a3ffad5db48aac3f04ef23e6d8c65934e0c43c747b79b8841c490af",
"contentSHA": "80750c40d8cfb210c11ce5aba0ff0b0e56fe77e73f5fda3be121002a024d6777",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
2 changes: 1 addition & 1 deletion integration/base/basic-stateless/expected/.ship/state.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"v1": {
"config": {},
"contentSHA": "3b20281c1e73d8d854316d4d74fc3af7675deab50679663566873f147726a11f",
"contentSHA": "11be80f75d1f078b2a3d15b5a19149e9d77793d22fb204855721c63ac078ec8c",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
2 changes: 1 addition & 1 deletion integration/base/basic/expected/.ship/state.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"test_option": "abc123_test-option-value"
},
"contentSHA": "3b20281c1e73d8d854316d4d74fc3af7675deab50679663566873f147726a11f",
"contentSHA": "11be80f75d1f078b2a3d15b5a19149e9d77793d22fb204855721c63ac078ec8c",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"t2_option": "abc123_abc123",
"t3_option": "abc123_abc123 + abc123"
},
"contentSHA": "d0d40cd4e897c8e2bec41669630b3033635e30b0acacb43c9676b0e7daa7ebf3",
"contentSHA": "7a932b97b1b54bc902001db4301aa4b721af45672c820ae835ddd1b82f219e9e",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
2 changes: 1 addition & 1 deletion integration/base/config-chain/expected/.ship/state.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"t2_option": "abc123_abc123",
"t3_option": "abc123_abc123 + abc123"
},
"contentSHA": "d0d40cd4e897c8e2bec41669630b3033635e30b0acacb43c9676b0e7daa7ebf3",
"contentSHA": "7a932b97b1b54bc902001db4301aa4b721af45672c820ae835ddd1b82f219e9e",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
2 changes: 1 addition & 1 deletion integration/base/default-values/expected/.ship/state.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"namespace": "Alpha",
"scheduler": ""
},
"contentSHA": "3227ff33ca66ceb1088335d11c62b628516870611c550330449da08cc4c9d8ba",
"contentSHA": "87e302cc9676dca53d95ac7d17a1b2a80992d880058abf823ffc9ceb6689ea19",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
2 changes: 1 addition & 1 deletion integration/base/docker-layer/expected/.ship/state.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"option": "value"
},
"contentSHA": "8764659df64cdeb83d13528d96ebe39414c8e0ec9c5bdc2ef0b1829d3957057a",
"contentSHA": "ae4f01eeccc34c4d66477e6b1be079ebbab123dd1a4268d19bed9c0c3dd37e7f",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
2 changes: 1 addition & 1 deletion integration/base/docker/expected/.ship/state.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"config": {
"test_option": "abc123_test-option-value"
},
"contentSHA": "8b264700d9195e35bdc95332279dccddc9a173510103be203c25f9bde1ca7f27",
"contentSHA": "8256c22bc76d8004b62fcbd1ee2baa0561a4128acf64c8160ebc471eeba63fd7",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
2 changes: 1 addition & 1 deletion integration/base/helm-nginx/expected/.ship/state.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"v1": {
"config": {},
"contentSHA": "144732da22781575a5368e9c50107d0f442aade5f9c84aa539ea372e436fdadb",
"contentSHA": "e3f72f22607ef7bde944fed3d0818577fbc9f6d69dca7c544f36b230a680f1a1",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
2 changes: 1 addition & 1 deletion integration/base/web/expected/.ship/state.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"methodType": "GET",
"resourceURL": "https://raw.githubusercontent.com/replicatedhq/test-charts/5bf016aac1786cb74c678c3419bb8623f0388f8d/web-asset/web-asset"
},
"contentSHA": "23d3d4d0f99ade2e646c26822d67dcde9d814de3b92a398648d25ea61a55df48",
"contentSHA": "2114b76dd0e0e7ec9154d5cafb9eeb6987555def60a59e13b3ce0fc57e8a81c9",
"metadata": {
"applicationType": "replicated.app",
"customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: jaeger-cassandra
labels:
app: cassandra
chart: cassandra-0.15.0
chart: cassandra-0.15.1
release: jaeger
heritage: Tiller
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: jaeger-cassandra
labels:
app: cassandra
chart: cassandra-0.15.0
chart: cassandra-0.15.1
release: jaeger
heritage: Tiller
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"v1": {
"config": {},
"upstream": "__upstream__",
"contentSHA": "3536a785cb227012537376c3d299c96dc28a8c3ffe13d1486fdb0caffa7b09bc",
"contentSHA": "492089992eb01a521db360b3b641af7409d66618a36fe2cd3106f89619768d8b",
"metadata": {
"applicationType": "replicated.app",
"customerID": "__customerID__",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"spec": "assets:\n v1:\n - amazon_eks:\n dest: new/new_vpc.tf\n cluster_name: '{{repl ConfigOption \"name_source\" }}'\n region: \"us-west-2\"\n created_vpc:\n vpc_cidr: '{{repl ConfigOption \"cidr_source\" }}'\n zones:\n - '{{repl ConfigOption \"zone_source\" }}'\n - us-west-2b\n public_subnets:\n - \"10.0.1.0/24\"\n - \"10.0.2.0/24\"\n private_subnets:\n - \"10.0.129.0/24\"\n - \"10.0.130.0/24\"\n autoscaling_groups:\n - name: alpha\n group_size: \"3\"\n machine_type: '{{repl ConfigOption \"machine_source\" }}'\n - name: bravo\n group_size: \"1\"\n machine_type: m5.4xlarge\n - inline:\n dest: install.sh\n contents: |\n #!/bin/bash\n echo \"run:\"\n echo \"terraform apply -f new/new_vpc.tf\"\n echo \"kubectl apply -f kube.yaml --kubeconfig {{repl AmazonEKS (ConfigOption \"name_source\") }}\"\n mode: 0777\n - inline:\n dest: kube.yaml\n contents: |\n this is not a valid kubernetes yaml\n mode: 0777\n\nconfig:\n v1:\n - name: template_sources\n title: Template Function Sources\n description: testing testing 123\n items:\n - name: name_source\n title: Name Source\n default: cluster-name-template\n type: text\n - name: cidr_source\n title: CIDR Source\n default: \"10.0.0.0/16\"\n type: text\n - name: zone_source\n title: Zone Source\n default: \"us-west-2a\"\n type: text\n - name: machine_source\n title: Machine Source\n default: m5.2xlarge\n type: text\n\nlifecycle:\n v1:\n - message:\n contents: \"hi\"\n - render: {}\n - message:\n contents: \"bye\"\n",
"images": [],
"githubContents": [],
"created": "Fri Nov 02 2018 17:07:38 GMT+0000 (UTC)",
"created": "2018-11-02T17:07:38.000Z",
"entitlements": {
"meta": {
"last_updated": "0001-01-01T00:00:00Z",
Expand Down
4 changes: 2 additions & 2 deletions integration/init_app/basic/expected/.ship/state.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"v1": {
"config": {},
"upstream": "__upstream__",
"contentSHA": "aafa722a828058d1da1eee0ee2f449533b9ddff13534ea94760fd177ab79e864",
"contentSHA": "8997ab5eed1468dfdcc8953b793a89d39efbcc08cac820f4e6d343f27636d3fc",
"metadata": {
"applicationType": "replicated.app",
"customerID": "__customerID__",
Expand Down Expand Up @@ -31,7 +31,7 @@
"spec": "---\nassets:\n v1:\n - inline:\n contents: |\n #!/bin/bash\n echo \"installing nothing\"\n echo \"config option: {{repl ConfigOption \"test_option\" }}\"\n dest: ./scripts/install.sh\n mode: 0777\n - inline:\n contents: |\n #!/bin/bash\n echo \"tested nothing\"\n echo \"customer {{repl Installation \"customer_id\" }}\"\n echo \"install {{repl Installation \"installation_id\" }}\"\n dest: ./scripts/test.sh\n mode: 0777\nconfig:\n v1:\n - name: test_options\n title: Test Options\n description: testing testing 123\n items:\n - name: test_option\n title: Test Option\n default: abc123_test-option-value\n type: text\nlifecycle:\n v1:\n - render: {}\n",
"images": [],
"githubContents": [],
"created": "Tue Dec 04 2018 03:21:49 GMT+0000 (UTC)",
"created": "2018-12-04T03:21:49.000Z",
"entitlements": {}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"spec": "---\nassets:\n v1:\n - inline:\n contents: |\n #!/bin/bash\n echo \"installing nothing\"\n echo \"config option: {{repl ConfigOption \"test_option\" }}\"\n dest: ./scripts/install.sh\n mode: 0777\n - inline:\n contents: |\n #!/bin/bash\n echo \"tested nothing\"\n echo \"customer {{repl Installation \"customer_id\" }}\"\n echo \"install {{repl Installation \"installation_id\" }}\"\n dest: ./scripts/test.sh\n mode: 0777\nconfig:\n v1:\n - name: test_options\n title: Test Options\n description: testing testing 123\n items:\n - name: test_option\n title: Test Option\n default: abc123_test-option-value\n type: text\nlifecycle:\n v1:\n - render: {}\n",
"images": [],
"githubContents": [],
"created": "Tue Dec 04 2018 03:21:49 GMT+0000 (UTC)",
"created": "2018-12-04T03:21:49.000Z",
"entitlements": {
"meta": {
"last_updated": "0001-01-01T00:00:00Z",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"arch": "amd64"
}
},
"contentSHA": "86448f75e9c4bdf955bbfc594e86308449ec5118472db1d8ee6d8039f3c40881"
"contentSHA": "3555d662950aad0214c26783543b484b3a6d8868a04816d17331e2aab840d076"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"spec": "assets:\n v1:\n - inline:\n contents: |\n apiVersion: apps/v1\n kind: Deployment\n metadata:\n name: redis\n labels:\n component: redis\n spec:\n replicas: 1\n selector:\n matchLabels:\n component: redis\n template:\n metadata:\n labels:\n component: redis\n spec:\n containers:\n - name: redis\n image: redis\n args: [\"--appendonly\", \"yes\"]\n dest: base/redis-deployment.yaml\n mode: 0644\nconfig:\n v1: []\nlifecycle:\n v1:\n - config:\n invalidates: [\"render\"]\n - render:\n requires: [\"config\"]\n root: \".\"\n - kustomize:\n requires: [\"render\"]\n base: ./base\n overlay: overlays/ship\n dest: rendered.yaml\n",
"images": [],
"githubContents": [],
"created": "Tue Jul 23 2019 17:45:00 GMT+0000 (UTC)",
"created": "2019-07-23T17:45:00.000Z",
"registrySecret": "3bfd99a69b5748fab756a593c7dcc852",
"entitlements": {
"meta": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"sequence": 0,
"version": "0.0.1"
},
"contentSHA": "7ecf2846a73c305b14b1bb2ef080ae62a92736561d7a2eaeaf1eef49749f0a6a"
"contentSHA": "edb3b28e1bcb404c0b1a5cd6198b93e5bef556e582e0cf646d24f1bd58369aee"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
],
"githubContents": [],
"created": "Tue Mar 19 2019 00:47:09 GMT+0000 (UTC)",
"created": "2019-03-19T00:47:09.000Z",
"registrySecret": "3bfd99a69b5748fab756a593c7dcc852",
"entitlements": {
"meta": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"sequence": 0,
"version": "1.0.0-SNAPSHOT"
},
"contentSHA": "e440ab14be5fead6c7f01efd0b24b9a1db2c809467dbeb314f81dcdeb8553ca7"
"contentSHA": "3bd2fa7428599e61779c7896b3630cbe046a469874d7345c01148e3a68ccde65"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
],
"githubContents": [],
"created": "Fri Jan 18 2019 20:45:25 GMT+0000 (UTC)",
"created": "2019-01-18T20:45:25.000Z",
"registrySecret": "THIS IS NOT A SECRET",
"entitlements": {
"meta": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"option": "abc123"
},
"upstream": "__upstream__",
"contentSHA": "1525f4ea74e654c3d6a021e2ded45e28b07164c5a2ef56a831047ef730c42a60",
"contentSHA": "4fea99c11f4bb028df543ecb45045ef18d01f9db664a2df2a764e877f4e112a9",
"metadata": {
"applicationType": "replicated.app",
"customerID": "__customerID__",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
]
}
],
"created": "Fri Nov 02 2018 17:07:52 GMT+0000 (UTC)",
"created": "2018-11-02T17:07:52.000Z",
"registrySecret": "3bfd99a69b5748fab756a593c7dcc852",
"entitlements": {
"meta": {
Expand Down
2 changes: 1 addition & 1 deletion integration/init_app/helm-github/expected/.ship/state.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"v1": {
"config": {},
"contentSHA": "d47ebd26011bd04c77946884c93a7ec98bee02108ef164424c05cd9095199f7b",
"contentSHA": "902ee33d1589f9e15b1a37dce3d8750b0b9fe42d014e98b43c97443dd766c094",
"releaseName": "integration-replicated-app-helm-github",
"upstream": "__upstream__",
"metadata": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
]
}
],
"created": "Wed Dec 12 2018 22:03:17 GMT+0000 (UTC)",
"created": "2018-12-12T22:03:17.000Z",
"entitlements": {
"meta": {
"last_updated": "0001-01-01T00:00:00Z",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"v1": {
"config": {},
"upstream": "__upstream__",
"contentSHA": "ffb4e54d56ff40765aad683612a5dd1dab8d899458092ec19fcfe473d85a3566",
"contentSHA": "33ab41091e94a8cc56140f3f0edf7e72380d0404421012e2c6a79435effa26d1",
"metadata": {
"applicationType": "replicated.app",
"customerID": "__customerID__",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"spec": "---\nassets:\n v1:\n - inline:\n contents: |\n #!/bin/bash\n echo \"installing nothing\"\n echo \"semver: {{repl Installation \"semver\" }}\"\n dest: ./scripts/install.sh\n mode: 0777\n - inline:\n contents: |\n #!/bin/bash\n echo \"tested nothing\"\n dest: ./scripts/test.sh\n mode: 0777\nconfig:\n v1:\n - name: test_options\n title: Test Options\n description: testing testing 123\n items:\n - name: test_option\n title: Test Option\n default: abc123_test-option-value\n type: text\nlifecycle:\n v1:\n - render: {}\n",
"images": [],
"githubContents": [],
"created": "Fri Nov 02 2018 17:08:04 GMT+0000 (UTC)",
"created": "2018-11-02T17:08:04.000Z",
"registrySecret": "3bfd99a69b5748fab756a593c7dcc852",
"entitlements": {
"meta": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"v1": {
"config": {},
"upstream": "__upstream__",
"contentSHA": "ecde9a9503806a80c7d65366b4484c4d8aaba13af29057849bd5c3475a760a42",
"contentSHA": "633a575ff6561213a71961555ec2dc71af85696aea34130027df505e41557c1c",
"metadata": {
"applicationType": "replicated.app",
"license": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"spec": "---\nassets:\n v1:\n - inline:\n contents: |\n {{repl CollectSpec }}\n dest: ./troubleshoot/collect.yml\n mode: 0644\n - inline:\n contents: |\n {{repl AnalyzeSpec }}\n dest: ./troubleshoot/analyze.yml\n mode: 0644\n\nconfig: {}\n\nlifecycle:\n v1:\n - render: {}\n",
"images": [],
"githubContents": [],
"created": "Fri Jul 05 2019 18:12:17 GMT+0000 (UTC)",
"created": "2019-07-05T18:12:17.000Z",
"registrySecret": "THIS IS NOT A SECRET",
"entitlements": {
"meta": {
Expand Down
Loading