@abgov/nx-oc 1.4.0-beta.4 → 2.0.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/executors/apply/apply.js.map +1 -1
- package/src/generators/apply-infra/apply-infra.js.map +1 -1
- package/src/generators/apply-infra/apply-infra.spec.ts +1 -3
- package/src/generators/deployment/deployment.js.map +1 -1
- package/src/generators/deployment/deployment.spec.ts +6 -18
- package/src/generators/pipeline/actions/workflows/pipeline.yml__tmpl__ +4 -6
- package/src/generators/pipeline/pipeline.js.map +1 -1
- package/src/generators/pipeline/pipeline.spec.ts +6 -18
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abgov/nx-oc",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0-beta.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"description": "Government of Alberta - DIO - Nx plugin for OpenShift.",
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"executors": "./executors.json",
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"yaml": "^1.10.2",
|
|
16
|
-
"@nrwl/devkit": "
|
|
16
|
+
"@nrwl/devkit": "12.10.1"
|
|
17
17
|
},
|
|
18
|
-
"typings": "src/index.d.ts",
|
|
18
|
+
"typings": "./src/index.d.ts",
|
|
19
19
|
"peerDependencies": {}
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/executors/apply/apply.ts"],"names":[],"mappings":";;;AACA,mDAAoD;AAGpD,SAAS,eAAe,CAAC,OAAe;IAEtC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACnD,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACxB,CACE,OAAO,CAAC,SAAS,CAAC,CAAC;YACnB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACrB,EAAE,CACH,CAAC;IAEJ,OAAO,EAAE,UAAU,EAAE,CAAA;AACvB,CAAC;AAED,SAA8B,WAAW,CACvC,OAAe,EACf,EAAE,WAAW,EAAmB;;QAEhC,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,KAAK,CAAC,CAAC;QAEtD,MAAM,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YACxC,MAAM,aAAa,GAAG,uBAAY,CAChC,SAAS,EACT;gBACE,iBAAiB,WAAW,IAAI,WAAW,MAAM;gBACjD,cAAc,SAAS,EAAE;aAC1B,CACF,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;gBAC1B,OAAO,KAAK,CAAC;aACd;iBACI;gBACH,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,uBAAY,CAAC,OAAO,EAAE,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;gBAC5E,OAAO,CAAC,GAAG,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/executors/apply/apply.ts"],"names":[],"mappings":";;;AACA,mDAAoD;AAGpD,SAAS,eAAe,CAAC,OAAe;IAEtC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACnD,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACxB,CACE,OAAO,CAAC,SAAS,CAAC,CAAC;YACnB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACrB,EAAE,CACH,CAAC;IAEJ,OAAO,EAAE,UAAU,EAAE,CAAA;AACvB,CAAC;AAED,SAA8B,WAAW,CACvC,OAAe,EACf,EAAE,WAAW,EAAmB;;QAEhC,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,KAAK,CAAC,CAAC;QAEtD,MAAM,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YACxC,MAAM,aAAa,GAAG,uBAAY,CAChC,SAAS,EACT;gBACE,iBAAiB,WAAW,IAAI,WAAW,MAAM;gBACjD,cAAc,SAAS,EAAE;aAC1B,CACF,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;gBAC1B,OAAO,KAAK,CAAC;aACd;iBACI;gBACH,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,uBAAY,CAAC,OAAO,EAAE,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;gBAC5E,OAAO,CAAC,GAAG,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,CAAC;gBAEhC,OAAO,OAAO,CAAC;aAChB;QACH,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAEjC,OAAO;YACL,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM;SACxB,CAAA;IACH,CAAC;CAAA;AA/BD,8BA+BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-infra.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/apply-infra/apply-infra.ts"],"names":[],"mappings":";;;AAGA,mDAAoD;AAEpD,SAAS,gBAAgB,CAAC,IAAU;IAElC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,uBAAY,CACpE,OAAO,EACP,EAAE,EACF,IAAI,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAC9C,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"apply-infra.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/apply-infra/apply-infra.ts"],"names":[],"mappings":";;;AAGA,mDAAoD;AAEpD,SAAS,gBAAgB,CAAC,IAAU;IAElC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,uBAAY,CACpE,OAAO,EACP,EAAE,EACF,IAAI,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAC9C,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE,CAAC,CAAC;IAErC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAY,CAC1D,OAAO,EACP,EAAE,EACF,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,CACzC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,CAAC;IAEhC,IAAI,CAAC,eAAe,IAAI,CAAC,UAAU,EAAE;QACnC,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;KACjE;AACH,CAAC;AAED,mBAA+B,IAAU;;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,uBAAY,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,OAAO,EAAE;YACX,gBAAgB,CAAC,IAAI,CAAC,CAAC;SACxB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;SACtE;IACH,CAAC;CAAA;AAPD,4BAOC"}
|
|
@@ -13,7 +13,7 @@ describe('Apply Infra Generator', () => {
|
|
|
13
13
|
mockedRunOcCommand.mockReset();
|
|
14
14
|
});
|
|
15
15
|
|
|
16
|
-
it ('can run', async (
|
|
16
|
+
it ('can run', async () => {
|
|
17
17
|
const host = createTree();
|
|
18
18
|
writeJson(host, '.openshift/environment.infra.yml', {});
|
|
19
19
|
writeJson(host, '.openshift/environment.env.yml', {});
|
|
@@ -26,7 +26,5 @@ describe('Apply Infra Generator', () => {
|
|
|
26
26
|
expect(mockedRunOcCommand.mock.calls[0][0]).toBe('project');
|
|
27
27
|
expect(mockedRunOcCommand.mock.calls[1][0]).toBe('apply');
|
|
28
28
|
expect(mockedRunOcCommand.mock.calls[2][0]).toBe('apply');
|
|
29
|
-
|
|
30
|
-
done();
|
|
31
29
|
});
|
|
32
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/deployment/deployment.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AACtB,6BAA6B;AAC7B,6BAA6B;AAC7B,qDAAwD;AAGxD,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;AAExD,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;;IAGf,MAAM,WAAW,GAAG,cAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAEpD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC;IACvD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/deployment/deployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ describe('Deployment Generator', () => {
|
|
|
7
7
|
|
|
8
8
|
const options: Schema = { project: 'test', tenant: 'test' }
|
|
9
9
|
|
|
10
|
-
it ('can run', async (
|
|
10
|
+
it ('can run', async () => {
|
|
11
11
|
const host = createTreeWithEmptyWorkspace();
|
|
12
12
|
await pipeline(
|
|
13
13
|
host,
|
|
@@ -35,11 +35,9 @@ describe('Deployment Generator', () => {
|
|
|
35
35
|
expect(config.targets['apply-envs']).toBeTruthy();
|
|
36
36
|
expect(config.targets['apply-envs'].executor).toBe('@abgov/nx-oc:apply');
|
|
37
37
|
expect(config.targets['apply-envs'].options.ocProject).toContain('test-dev');
|
|
38
|
-
|
|
39
|
-
done();
|
|
40
38
|
});
|
|
41
39
|
|
|
42
|
-
it ('can generate deployment for react', async (
|
|
40
|
+
it ('can generate deployment for react', async () => {
|
|
43
41
|
const host = createTreeWithEmptyWorkspace();
|
|
44
42
|
await pipeline(
|
|
45
43
|
host,
|
|
@@ -67,11 +65,9 @@ describe('Deployment Generator', () => {
|
|
|
67
65
|
|
|
68
66
|
const dockerfile = host.read('.openshift/test/Dockerfile').toString();
|
|
69
67
|
expect(dockerfile).toContain('nginx');
|
|
70
|
-
|
|
71
|
-
done();
|
|
72
68
|
});
|
|
73
69
|
|
|
74
|
-
it ('can generate deployment for angular', async (
|
|
70
|
+
it ('can generate deployment for angular', async () => {
|
|
75
71
|
const host = createTreeWithEmptyWorkspace();
|
|
76
72
|
await pipeline(
|
|
77
73
|
host,
|
|
@@ -99,11 +95,9 @@ describe('Deployment Generator', () => {
|
|
|
99
95
|
|
|
100
96
|
const dockerfile = host.read('.openshift/test/Dockerfile').toString();
|
|
101
97
|
expect(dockerfile).toContain('nginx');
|
|
102
|
-
|
|
103
|
-
done();
|
|
104
98
|
});
|
|
105
99
|
|
|
106
|
-
it ('can generate deployment for express', async (
|
|
100
|
+
it ('can generate deployment for express', async () => {
|
|
107
101
|
const host = createTreeWithEmptyWorkspace();
|
|
108
102
|
await pipeline(
|
|
109
103
|
host,
|
|
@@ -131,11 +125,9 @@ describe('Deployment Generator', () => {
|
|
|
131
125
|
|
|
132
126
|
const dockerfile = host.read('.openshift/test/Dockerfile').toString();
|
|
133
127
|
expect(dockerfile).toContain('node');
|
|
134
|
-
|
|
135
|
-
done();
|
|
136
128
|
});
|
|
137
129
|
|
|
138
|
-
it ('can generate deployment for dotnet', async (
|
|
130
|
+
it ('can generate deployment for dotnet', async () => {
|
|
139
131
|
const host = createTreeWithEmptyWorkspace();
|
|
140
132
|
await pipeline(
|
|
141
133
|
host,
|
|
@@ -163,11 +155,9 @@ describe('Deployment Generator', () => {
|
|
|
163
155
|
|
|
164
156
|
const dockerfile = host.read('.openshift/test/Dockerfile').toString();
|
|
165
157
|
expect(dockerfile).toContain('dotnet');
|
|
166
|
-
|
|
167
|
-
done();
|
|
168
158
|
});
|
|
169
159
|
|
|
170
|
-
it ('can skip unknown project type', async (
|
|
160
|
+
it ('can skip unknown project type', async () => {
|
|
171
161
|
const host = createTreeWithEmptyWorkspace();
|
|
172
162
|
await pipeline(
|
|
173
163
|
host,
|
|
@@ -195,7 +185,5 @@ describe('Deployment Generator', () => {
|
|
|
195
185
|
|
|
196
186
|
const config = readProjectConfiguration(host, 'test');
|
|
197
187
|
expect(config.targets['apply-envs']).toBeFalsy();
|
|
198
|
-
|
|
199
|
-
done();
|
|
200
188
|
});
|
|
201
189
|
});
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
# and GitHub.
|
|
5
5
|
#
|
|
6
6
|
# Secrets (to be manually added):
|
|
7
|
-
# REPO_ACCESS_TOKEN - GitHub access token for getting workflow history used for last successful commit
|
|
8
7
|
# OPENSHIFT_SERVER - URL to the OpenShift server.
|
|
9
8
|
# OPENSHIFT_TOKEN - Token for the service account (github-actions) used for OC cli commands.
|
|
10
9
|
#
|
|
@@ -49,7 +48,7 @@ jobs:
|
|
|
49
48
|
with:
|
|
50
49
|
branch: ${{ steps.get_branch_name.outputs.short_ref }}
|
|
51
50
|
workflow_id: pipeline.yml
|
|
52
|
-
github_token: ${{ secrets.
|
|
51
|
+
github_token: ${{ secrets.GITHUB_TOKEN }}
|
|
53
52
|
- name: Set AFFECTED_BASE to last successful build commit
|
|
54
53
|
if: ${{ steps.last_successful_commit.outputs.commit_hash }}
|
|
55
54
|
run: echo "AFFECTED_BASE=${{ steps.last_successful_commit.outputs.commit_hash }}" >> $GITHUB_ENV
|
|
@@ -66,11 +65,10 @@ jobs:
|
|
|
66
65
|
run: npm run affected:test -- --base=${{ env.AFFECTED_BASE }}
|
|
67
66
|
- name: Build
|
|
68
67
|
run: npm run affected:build -- --base=${{ env.AFFECTED_BASE }} --configuration production
|
|
69
|
-
- run: npm prune --production
|
|
70
|
-
|
|
71
68
|
# Set affected apps to env for later steps and jobs.
|
|
72
69
|
- name: Set AFFECTED_APPS for OC steps
|
|
73
70
|
run: echo "AFFECTED_APPS=$(npx nx affected:apps --plain --base=${{ env.AFFECTED_BASE }})" >> $GITHUB_ENV
|
|
71
|
+
- run: npm prune --production
|
|
74
72
|
|
|
75
73
|
# Run the OC BuildConfigs for create containers.
|
|
76
74
|
- name: OC login
|
|
@@ -88,7 +86,7 @@ jobs:
|
|
|
88
86
|
run: |
|
|
89
87
|
for app in $AFFECTED_APPS
|
|
90
88
|
do
|
|
91
|
-
oc start-build $app --from-dir
|
|
89
|
+
oc start-build $app --from-dir . --follow
|
|
92
90
|
done
|
|
93
91
|
# Set build job outputs for subsequent jobs.
|
|
94
92
|
- id: set_outputs
|
|
@@ -112,7 +110,7 @@ jobs:
|
|
|
112
110
|
insecure_skip_tls_verify: true
|
|
113
111
|
- name: Tag <%= envs[i] %>
|
|
114
112
|
run: |
|
|
115
|
-
for app in $
|
|
113
|
+
for app in $AFFECTED_APPS
|
|
116
114
|
do
|
|
117
115
|
oc tag $app:latest $app:<%= envs[i].toLowerCase() %>
|
|
118
116
|
done
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/pipeline/pipeline.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,6BAA6B;AAC7B,qDAAwD;AACxD,4DAA6D;AAG7D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAEnD,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/pipeline/pipeline.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,6BAA6B;AAC7B,qDAAwD;AACxD,4DAA6D;AAG7D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAEnD,MAAM,aAAa,GAAG,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,KAAK,CAAC,GAAG,CAAC,KAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAI,eAAe,CAAC,IAAI,KAAK,aAAa,CAAC,MAAM,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,uCACK,OAAO,KACV,cAAc,EAAE,OAAO,CAAC,QAAQ,EAChC,cAAc,EAAE,OAAO,CAAC,KAAK,EAC7B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAC9B,YAAY,EAAE,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IACjE;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;;IAErD,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAEhD,MAAM,eAAe,mCAChB,OAAO,KACV,mBAAmB,EAAE,MAAA,2BAAe,EAAE,0CAAE,IAAI,EAAE,EAC9C,IAAI,EACJ,IAAI,EAAE,EAAE,GACT,CAAC;IAEF,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;QACtC,sBAAa,CACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAgB,CAAC,IAAI,CAAC,CAAC,aAAa,EACpD,eAAe,CAChB,CAAC;KACH;SAAM,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;QAC7C,sBAAa,CACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EACzC,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAgB,CAAC,IAAI,CAAC,CAAC,aAAa,EACpD,eAAe,CAChB,CAAC;QACF,sBAAa,CACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EACzC,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAgB,CAAC,IAAI,CAAC,CAAC,oBAAoB,EAC3D,eAAe,CAChB,CAAC;KACH;AACH,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;QAExB,IAAI,iBAAiB,CAAC,aAAa,EAAE;YACnC,MAAM,qBAAmB,CAAC,IAAI,CAAC,CAAC;SACjC;IACH,CAAC;CAAA;AATD,4BASC"}
|
|
@@ -12,17 +12,15 @@ describe('Pipeline Generator', () => {
|
|
|
12
12
|
envs: 'test-dev'
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
it ('can run', async (
|
|
15
|
+
it ('can run', async () => {
|
|
16
16
|
const host = createTreeWithEmptyWorkspace();
|
|
17
17
|
await generator(host, options);
|
|
18
18
|
expect(host.exists('.openshift/Jenkinsfile')).toBeTruthy();
|
|
19
19
|
expect(host.exists('.openshift/environment.infra.yml')).toBeTruthy();
|
|
20
20
|
expect(host.exists('.openshift/environments.yml')).toBeTruthy();
|
|
21
|
-
|
|
22
|
-
done();
|
|
23
21
|
});
|
|
24
22
|
|
|
25
|
-
it ('can generate multiple envs', async (
|
|
23
|
+
it ('can generate multiple envs', async () => {
|
|
26
24
|
const host = createTreeWithEmptyWorkspace();
|
|
27
25
|
await generator(host, { ...options, envs: 'test-dev test-test' });
|
|
28
26
|
expect(host.exists('.openshift/environments.yml')).toBeTruthy();
|
|
@@ -30,17 +28,13 @@ describe('Pipeline Generator', () => {
|
|
|
30
28
|
const envs = host.read('.openshift/environments.yml').toString();
|
|
31
29
|
expect(envs).toContain('test-dev');
|
|
32
30
|
expect(envs).toContain('test-test');
|
|
33
|
-
|
|
34
|
-
done();
|
|
35
31
|
});
|
|
36
32
|
|
|
37
|
-
it ('can fail for duplicate env project', async (
|
|
33
|
+
it ('can fail for duplicate env project', async () => {
|
|
38
34
|
const host = createTreeWithEmptyWorkspace();
|
|
39
35
|
await expect(
|
|
40
36
|
generator(host, { ...options, envs: 'test-dev test-dev' })
|
|
41
37
|
).rejects.toThrow('Each environment must be a unique project.');
|
|
42
|
-
|
|
43
|
-
done();
|
|
44
38
|
});
|
|
45
39
|
});
|
|
46
40
|
|
|
@@ -52,17 +46,15 @@ describe('Pipeline Generator', () => {
|
|
|
52
46
|
envs: 'test-dev'
|
|
53
47
|
}
|
|
54
48
|
|
|
55
|
-
it ('can run', async (
|
|
49
|
+
it ('can run', async () => {
|
|
56
50
|
const host = createTreeWithEmptyWorkspace();
|
|
57
51
|
await generator(host, options);
|
|
58
52
|
expect(host.exists('.github/workflows/pipeline.yml')).toBeTruthy();
|
|
59
53
|
expect(host.exists('.openshift/environment.infra.yml')).toBeTruthy();
|
|
60
54
|
expect(host.exists('.openshift/environments.yml')).toBeTruthy();
|
|
61
|
-
|
|
62
|
-
done();
|
|
63
55
|
});
|
|
64
56
|
|
|
65
|
-
it ('can generate multiple envs', async (
|
|
57
|
+
it ('can generate multiple envs', async () => {
|
|
66
58
|
const host = createTreeWithEmptyWorkspace();
|
|
67
59
|
await generator(host, { ...options, envs: 'test-dev test-test' });
|
|
68
60
|
expect(host.exists('.openshift/environments.yml')).toBeTruthy();
|
|
@@ -70,17 +62,13 @@ describe('Pipeline Generator', () => {
|
|
|
70
62
|
const envs = host.read('.openshift/environments.yml').toString();
|
|
71
63
|
expect(envs).toContain('test-dev');
|
|
72
64
|
expect(envs).toContain('test-test');
|
|
73
|
-
|
|
74
|
-
done();
|
|
75
65
|
});
|
|
76
66
|
|
|
77
|
-
it ('can fail for duplicate env project', async (
|
|
67
|
+
it ('can fail for duplicate env project', async () => {
|
|
78
68
|
const host = createTreeWithEmptyWorkspace();
|
|
79
69
|
await expect(
|
|
80
70
|
generator(host, { ...options, envs: 'test-dev test-dev' })
|
|
81
71
|
).rejects.toThrow('Each environment must be a unique project.');
|
|
82
|
-
|
|
83
|
-
done();
|
|
84
72
|
});
|
|
85
73
|
});
|
|
86
74
|
});
|