Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Schema
Commits
7195918b
Commit
7195918b
authored
Dec 30, 2020
by
harshit aggarwal
Browse files
PR comments
parent
af7698f5
Pipeline
#20361
failed with stages
in 54 minutes and 56 seconds
Changes
7
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
7195918b
...
...
@@ -17,8 +17,8 @@ variables:
AZURE_TEST_SUBDIR
:
testing/schema-test-core
AZURE_DEPLOYMENTS_SUBDIR
:
deployments/scripts/azure
AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR
:
deployments/scripts
INTEGRATION_TESTER
:
$AZURE_PRINCIPAL_ID
AZURE_
TESTER_SERVICEPRINCIPAL
_SECRET
:
$AZURE_PRINCIPAL_SECRET
AZURE_CLIENT_ID
:
$AZURE_PRINCIPAL_ID
AZURE_
CLIENT
_SECRET
:
$AZURE_PRINCIPAL_SECRET
DATA_PARTITION
:
opendes
AZURE_AD_APP_RESOURCE_ID
:
$AZURE_APP_ID
AZURE_STORAGE_CONNECTION_STRING
:
DefaultEndpointsProtocol=https;AccountName=${AZURE_BASE}data;AccountKey=${AZURE_STORAGE_KEY};EndpointSuffix=core.windows.net
...
...
deployments/scripts/azure/Token.py
View file @
7195918b
...
...
@@ -6,8 +6,8 @@ class AzureToken(object):
def
get_azure_id_token
(
self
):
tenant_id
=
os
.
getenv
(
'AZURE_TENANT_ID'
)
resource_id
=
os
.
getenv
(
'AZURE_AD_APP_RESOURCE_ID'
)
client_id
=
os
.
getenv
(
'
INTEGRATION_TESTER
'
)
client_secret
=
os
.
getenv
(
'AZURE_
TESTER_SERVICEPRINCIPAL
_SECRET'
)
client_id
=
os
.
getenv
(
'
AZURE_CLIENT_ID
'
)
client_secret
=
os
.
getenv
(
'AZURE_
CLIENT
_SECRET'
)
if
tenant_id
is
None
:
print
(
'Please pass tenant Id to generate token'
)
...
...
devops/azure/bootstrap-ta
sk
.yml
→
devops/azure/bootstrap-
s
ta
ge
.yml
View file @
7195918b
...
...
@@ -40,15 +40,16 @@ stages:
addToPath
:
true
architecture
:
'
x64'
-
task
:
Bash@3
displayName
:
'
Deploy
Schemas'
displayName
:
'
Bootstrap
Schemas'
inputs
:
targetType
:
'
inline'
script
:
|
export AZURE_DEPLOYMENTS_SUBDIR=$(System.DefaultWorkingDirectory)/${{ parameters.artifactName }}/deployments/scripts/azure
# These variables are required for generating the token
export AZURE_TENANT_ID=$(AZURE_TENANT_ID)
export AZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID)
export
INTEGRATION_TESTER
=$(INTEGRATION_TESTER)
export AZURE_
TESTER_SERVICEPRINCIPAL
_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET)
export
AZURE_CLIENT_ID
=$(INTEGRATION_TESTER)
export AZURE_
CLIENT
_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET)
export DATA_PARTITION=$(DATA_PARTITION_ID)
pip install -r $AZURE_DEPLOYMENTS_SUBDIR/requirements.txt
...
...
devops/azure/deploy-stage
s
.yml
→
devops/azure/deploy-stage.yml
View file @
7195918b
File moved
devops/azure/development-pipeline.yml
View file @
7195918b
...
...
@@ -71,7 +71,7 @@ stages:
serviceBase
:
${{ variables.serviceName }}
testingRootFolder
:
'
testing'
chartPath
:
${{ variables.chartPath }}
-
template
:
deploy-stage
s
.yml
-
template
:
deploy-stage.yml
parameters
:
serviceName
:
${{ variables.serviceName }}
chartPath
:
${{ variables.chartPath }}
...
...
@@ -84,7 +84,7 @@ stages:
providers
:
-
name
:
Azure
environments
:
[
'
dev'
]
-
template
:
bootstrap-ta
sk
.yml
-
template
:
bootstrap-
s
ta
ge
.yml
parameters
:
serviceName
:
${{ variables.serviceName }}
providers
:
...
...
devops/azure/gitlab-bootstrap.yml
View file @
7195918b
...
...
@@ -11,7 +11,6 @@ azure_bootstrap:
-
$AZURE == 'true'
azure_test
:
needs
:
[
"
azure_bootstrap"
]
only
:
variables
:
-
$AZURE == 'true'
devops/azure/pipeline.yml
View file @
7195918b
...
...
@@ -71,7 +71,7 @@ stages:
serviceBase
:
${{ variables.serviceName }}
testingRootFolder
:
'
testing'
chartPath
:
${{ variables.chartPath }}
-
template
:
deploy-stage
s
.yml
-
template
:
deploy-stage.yml
parameters
:
serviceName
:
${{ variables.serviceName }}
chartPath
:
${{ variables.chartPath }}
...
...
@@ -84,7 +84,7 @@ stages:
providers
:
-
name
:
Azure
environments
:
[
'
demo'
]
-
template
:
bootstrap-ta
sk
.yml
-
template
:
bootstrap-
s
ta
ge
.yml
parameters
:
serviceName
:
${{ variables.serviceName }}
providers
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment