diff --git a/builds/jazz-build-module/sls-app/serverless-build-rules.yml b/builds/jazz-build-module/sls-app/serverless-build-rules.yml index 6b641ba016..8e126204b5 100644 --- a/builds/jazz-build-module/sls-app/serverless-build-rules.yml +++ b/builds/jazz-build-module/sls-app/serverless-build-rules.yml @@ -69,7 +69,6 @@ provider: sbr-render: config-wins sbr-constraint: sbr-enum: - - nodejs8.10 - nodejs10.x - java8 - python3.6 @@ -578,7 +577,6 @@ function: sbr-render: config-wins sbr-constraint: sbr-enum: - - nodejs8.10 - nodejs10.x - java8 - python3.6 diff --git a/builds/jenkins-build-pack-api/Jenkinsfile b/builds/jenkins-build-pack-api/Jenkinsfile index 4c9590b849..f9d9cc36de 100644 --- a/builds/jenkins-build-pack-api/Jenkinsfile +++ b/builds/jenkins-build-pack-api/Jenkinsfile @@ -936,7 +936,7 @@ def validateDeploymentConfigurations(def prop) { error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration" } else { - def validRuntimes = ["nodejs8.10", "nodejs10.x", "python3.6", "java8", "go1.x"] + def validRuntimes = ["nodejs10.x", "python3.6", "java8", "go1.x"] def flag = false for (int i = 0; i < validRuntimes.size(); i++) { if (_runtime == validRuntimes[i]) { diff --git a/builds/jenkins-build-pack-function/Jenkinsfile b/builds/jenkins-build-pack-function/Jenkinsfile index ba1dcf63b3..96fd68c6fc 100644 --- a/builds/jenkins-build-pack-function/Jenkinsfile +++ b/builds/jenkins-build-pack-function/Jenkinsfile @@ -746,42 +746,42 @@ def resetCredentials(credsId) { missing. */ def validateDeploymentConfigurations(def prop) { - if (prop.containsKey("service")) { - if (prop['service'] == "") { - error "Wrong configuration. Value for Key 'service' is missing in the configuration" - } - } else { - error "Wrong configuration. Key 'service' is missing in the configuration" - } - if (prop.containsKey("providerRuntime")) { - def _runtime = prop['providerRuntime'] - if (_runtime == "") { - error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration" - } else { - def validRuntimes = ["nodejs8.10", "nodejs10.x", "python3.6", "java8", "go1.x", "c#"] - def flag = false - - for (int i = 0; i < validRuntimes.size(); i++) { - if (_runtime == validRuntimes[i]) { - flag = true - } - } - - if (!flag) { - echo "$flag" - error "Runtime given in the configuration is not valid." - } - } - } else { - error "Wrong configuration. Key 'providerRuntime' is missing in the configuration" - } - if (prop.containsKey("providerTimeout")) { - if (prop['providerTimeout'] == "") { - error "Wrong configuration. Value for Key 'providerTimeout' is missing in the configuration" - } else if (Integer.parseInt(prop['providerTimeout']) > 300) { // Should not be a high - error "Wrong configuration. Value for Key 'providerTimeout' should be a less than 160" - } - } else if (config['provider'] == "azure") { + if (prop.containsKey("service")) { + if (prop['service'] == "") { + error "Wrong configuration. Value for Key 'service' is missing in the configuration" + } + } else { + error "Wrong configuration. Key 'service' is missing in the configuration" + } + if (prop.containsKey("providerRuntime")) { + def _runtime = prop['providerRuntime'] + if (_runtime == "") { + error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration" + } else { + def validRuntimes = ["nodejs10.x", "python3.6", "java8", "go1.x", "c#"] + def flag = false + + for (int i = 0; i < validRuntimes.size(); i++) { + if (_runtime == validRuntimes[i]) { + flag = true + } + } + + if (!flag) { + echo "$flag" + error "Runtime given in the configuration is not valid." + } + } + } else { + error "Wrong configuration. Key 'providerRuntime' is missing in the configuration" + } + if (prop.containsKey("providerTimeout")) { + if (prop['providerTimeout'] == "") { + error "Wrong configuration. Value for Key 'providerTimeout' is missing in the configuration" + } else if (Integer.parseInt(prop['providerTimeout']) > 300) { // Should not be a high + error "Wrong configuration. Value for Key 'providerTimeout' should be a less than 160" + } + } else if (config['provider'] == "azure") { // we use azure default timeout } else { error "Wrong configuration. Key 'providerTimeout' is missing in the configuration" diff --git a/builds/jenkins-build-pack-sls-app/Jenkinsfile b/builds/jenkins-build-pack-sls-app/Jenkinsfile index 1e9c21121b..bdd28840cb 100644 --- a/builds/jenkins-build-pack-sls-app/Jenkinsfile +++ b/builds/jenkins-build-pack-sls-app/Jenkinsfile @@ -693,7 +693,7 @@ def validateDeploymentConfigurations(def prop) { if (_runtime == "") { error "Wrong configuration. Value for Key 'providerRuntime' is missing in the configuration" } else { - def validRuntimes = ["nodejs8.10", "nodejs10.x", "python3.6", "java8", "go1.x"] + def validRuntimes = ["nodejs10.x", "python3.6", "java8", "go1.x"] def flag = false for (int i = 0; i < validRuntimes.size(); i++) { diff --git a/core/jazz_create-serverless-service/swagger/swagger.json b/core/jazz_create-serverless-service/swagger/swagger.json index e0d1b01644..9b5eda934e 100644 --- a/core/jazz_create-serverless-service/swagger/swagger.json +++ b/core/jazz_create-serverless-service/swagger/swagger.json @@ -282,7 +282,6 @@ "type": "string", "description": "The runtime framework for executing your code", "enum": [ - "nodejs8.10", "nodejs10.x", "java8", "python3.6", diff --git a/core/jazz_services/config/global-config.json b/core/jazz_services/config/global-config.json index 8bea4d6c7a..9af1b8bc40 100644 --- a/core/jazz_services/config/global-config.json +++ b/core/jazz_services/config/global-config.json @@ -132,7 +132,6 @@ ], "SERVICE_RUNTIMES": [ "nodejs10.x", - "nodejs8.10", "python3.6", "java8", "go1.x", diff --git a/core/jazz_services/test/test.js b/core/jazz_services/test/test.js index d5226a1fe0..5e7a045aa1 100644 --- a/core/jazz_services/test/test.js +++ b/core/jazz_services/test/test.js @@ -68,7 +68,7 @@ describe('platform_services', function() { "domain" : "k!ngd0m", "region" : "mewni", "type" : "api", - "runtime" : "nodejs8.10", + "runtime" : "nodejs10.x", "created_by" : "g10$saryck", "status" : "active" }, diff --git a/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.html b/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.html index 9190af9274..40610169bd 100644 --- a/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.html +++ b/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.html @@ -177,8 +177,8 @@

- - + +
@@ -188,8 +188,8 @@

- - + +
@@ -197,12 +197,12 @@

-
+
- - + +
@@ -211,11 +211,11 @@

-
+
- - + +
@@ -223,18 +223,6 @@

-
-
-
- - -
-
-
-

C#

-
-
-
diff --git a/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.scss b/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.scss index 77f39efacc..8004932ef7 100644 --- a/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.scss +++ b/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.scss @@ -20,6 +20,9 @@ height: 20px; padding: 10px 10px; } +.runtime-row2.contentSpace{ + width: 41% +} .create-service-wrap .bold-title { padding: 1.33rem 0; diff --git a/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.ts b/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.ts index bb1b0f8686..40bc5f9cb7 100644 --- a/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.ts +++ b/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.ts @@ -467,7 +467,6 @@ export class CreateServiceComponent implements OnInit { switch(this.runtime){ case 'java8' : this.deploymentDescriptorText = this.deploymentDescriptorTextJava; break; - case 'nodejs8.10' : this.deploymentDescriptorText = this.deploymentDescriptorTextNodejs; break; case 'nodejs10.x' : this.deploymentDescriptorText = this.deploymentDescriptorTextNodejs; break; case 'go1.x' : this.deploymentDescriptorText = this.deploymentDescriptorTextgo; break; case 'python3.6' : this.deploymentDescriptorText = this.deploymentDescriptorTextpython; break; diff --git a/core/jazz_ui/src/environments/environment.oss.ts b/core/jazz_ui/src/environments/environment.oss.ts index a183dfdede..fc9b2beeae 100644 --- a/core/jazz_ui/src/environments/environment.oss.ts +++ b/core/jazz_ui/src/environments/environment.oss.ts @@ -8,7 +8,7 @@ export const environment = { multi_env: {multi_env}, slack_support: {slack_support}, webLists: { "html": "Static", "angular": "Angular", "react": "ReactJS" }, - envLists: { "nodejs10.x": "Nodejs 10.x", "nodejs8.10": "Nodejs 8.10", "python3.6": "Python 3.6", "java8": "Java 8", "go1.x": "Go 1.x", "c#": "C#" }, + envLists: { "nodejs10.x": "Nodejs 10.x", "python3.6": "Python 3.6", "java8": "Java 8", "go1.x": "Go 1.x", "c#": "C#" }, serviceTabs: ["{overview}", "{access control}", "{metrics}", "{logs}", "{cost}"], environmentTabs: ["{env_overview}", "{deployments}", "{code quality}", "{metrics}", "{assets}", "{env_logs}"], assetTypeList: [ @@ -55,7 +55,7 @@ export const environment = { aws: { account_number: '{account_number}', region: '{region}', - envLists: {"nodejs10.x": "Nodejs 10.x", "nodejs8.10": "Nodejs 8.10", "python3.6": "Python 3.6", "java8": "Java 8", "go1.x": "Go 1.x"}, + envLists: {"nodejs10.x": "Nodejs 10.x", "python3.6": "Python 3.6", "java8": "Java 8", "go1.x": "Go 1.x"}, accountMap: {accountMap}, default_region: '{default_region}', default_account: '{default_account}' @@ -64,7 +64,7 @@ export const environment = { azure_account_number: '{azure_account_number}', azure_region: '{azure_region}', azure_enabled: {azure_enabled}, - envLists: {"nodejs8.10": "Nodejs 8.10", "c#": "C#"}, + envLists: {"nodejs10.x": "Nodejs 10.x", "c#": "C#"}, }, tvault: { tvault_enabled: {tvault_enabled},