From 6fa7f93e3d78ce3e8d6165547cde3237bcab31ed Mon Sep 17 00:00:00 2001 From: Nico Hanus Date: Thu, 5 Nov 2020 15:50:19 +0100 Subject: [PATCH] enable feature Build for new stage --- .../src/assets/config/config.feature.json | 57 +++++++++++++++++++ azure-pipelines.yml | 45 ++++++++------- helmvalues/client.Feature.yaml | 15 +++++ 3 files changed, 95 insertions(+), 22 deletions(-) create mode 100644 apps/sales/src/assets/config/config.feature.json create mode 100644 helmvalues/client.Feature.yaml diff --git a/apps/sales/src/assets/config/config.feature.json b/apps/sales/src/assets/config/config.feature.json new file mode 100644 index 000000000..d1ca3e8b8 --- /dev/null +++ b/apps/sales/src/assets/config/config.feature.json @@ -0,0 +1,57 @@ +{ + "includeGoogleAnalytics": false, + "title": "ISA - feature", + "sso": { + "issuer": "https://sso-test.paragon-data.de", + "clientId": "hug-isa", + "responseType": "id_token token", + "oidc": true, + "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi" + }, + "swagger": { + "api": { + "rootUrl": "https://isa-test.paragon-data.net/catsearch/v5" + }, + "av": { + "rootUrl": "https://isa-test.paragon-data.net/ava/v4" + }, + "checkout": { + "rootUrl": "https://isa-test.paragon-data.net/checkout/v3" + }, + "crm": { + "rootUrl": "https://isa-test.paragon-data.net/crm/v2" + }, + "isa": { + "rootUrl": "https://isa-test.paragon-data.net/isa/v1" + }, + "oms": { + "rootUrl": "https://isa-test.paragon-data.net/oms/v2" + }, + "print": { + "rootUrl": "https://isa-test.paragon-data.net/print/v1" + }, + "eis": { + "rootUrl": "https://filialinformationsystem-integration.paragon-systems.de/eiswebapi/v1" + } + }, + "remissionModuleOptions": { + "useMock": false, + "endpoints": { + "catsearch": "https://isa-test.paragon-data.net/catsearch/v5/", + "remi": "https://isa-test.paragon-data.net/inv/v1/", + "print": "https://isa-test.paragon-data.net/print/v1/" + } + }, + + "taskCalendarModuleOptions": { + "useMock": false, + "endpoints": { + "eis": "https://isa-test.paragon-data.net/eis/v1/" + } + }, + + "taskCalendarConfig": { + "monthsOffset": 3, + "weeksOffset": 2 + } +} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index de7ae640b..983081637 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,27 +16,27 @@ variables: value: "$[counter(format('{0}.{1}', variables['Major'], variables['Minor']),0)]" jobs: - - job: cibuild_fast - displayName: ISAClient CI Fast - pool: - name: 'Default' - demands: - - Agent.OS -equals Linux - - docker - condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/develop'), ne(variables['Build.SourceBranch'], 'refs/heads/integration'), ne(variables['Build.SourceBranch'], 'refs/heads/master'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/')), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) - steps: - - task: npmAuthenticate@0 - displayName: 'npm auth' - inputs: - workingFile: .npmrc - - task: Docker@2 - displayName: 'build ISAClient Debug' - inputs: - command: 'build' - Dockerfile: Dockerfile - buildContext: - tags: '$(Build.BuildNumber)-$(Build.SourceVersion)' - arguments: '--build-arg SEMVERSION=$(Major).$(Minor).$(Patch)' + # - job: cibuild_fast + # displayName: ISAClient CI Fast + # pool: + # name: 'Default' + # demands: + # - Agent.OS -equals Linux + # - docker + # condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/develop'), ne(variables['Build.SourceBranch'], 'refs/heads/integration'), ne(variables['Build.SourceBranch'], 'refs/heads/master'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/')), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) + # steps: + # - task: npmAuthenticate@0 + # displayName: 'npm auth' + # inputs: + # workingFile: .npmrc + # - task: Docker@2 + # displayName: 'build ISAClient Debug' + # inputs: + # command: 'build' + # Dockerfile: Dockerfile + # buildContext: + # tags: '$(Build.BuildNumber)-$(Build.SourceVersion)' + # arguments: '--build-arg SEMVERSION=$(Major).$(Minor).$(Patch)' - job: cibuild_debug displayName: ISAClient CI Debug @@ -45,7 +45,8 @@ jobs: demands: - Agent.OS -equals Linux - docker - condition: eq(variables['Build.SourceBranch'], 'refs/heads/develop') + # condition: eq(variables['Build.SourceBranch'], 'refs/heads/develop') + condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/integration'), ne(variables['Build.SourceBranch'], 'refs/heads/master'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/')), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) steps: - task: npmAuthenticate@0 displayName: 'npm auth' diff --git a/helmvalues/client.Feature.yaml b/helmvalues/client.Feature.yaml new file mode 100644 index 000000000..073a1be46 --- /dev/null +++ b/helmvalues/client.Feature.yaml @@ -0,0 +1,15 @@ +fullnameOverride: isa-ui +image: + harborRepo: isa/ui + tag: debug-%BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION% + +ingress: + enabled: true + path: / + hosts: + - isa-%LOWERENVIRONMENT%.kubernetes.paragon-systems.de + +aspnet_environment: %ENVIRONMENT% + +configMap: + mountPath: /usr/share/nginx/html/assets/config