Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
user-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OZG-Cloud
app
user-manager
Commits
68b53540
Commit
68b53540
authored
8 months ago
by
OZGCloud
Browse files
Options
Downloads
Patches
Plain Diff
OZG-6710 setup branch for user-manager-interface with proto4
parent
5e4d69ed
Branches
master-interface-proto4
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
Jenkinsfile
+50
-0
50 additions, 0 deletions
Jenkinsfile
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
user-manager-interface/pom.xml
+9
-4
9 additions, 4 deletions
user-manager-interface/pom.xml
user-manager-server/pom.xml
+1
-0
1 addition, 0 deletions
user-manager-server/pom.xml
with
61 additions
and
5 deletions
Jenkinsfile
+
50
−
0
View file @
68b53540
...
...
@@ -49,6 +49,8 @@ pipeline {
anyOf
{
branch
'master'
branch
'release'
branch
'master-interface-proto4'
branch
'release-interface-proto4'
}
}
}
...
...
@@ -64,6 +66,14 @@ pipeline {
}
}
stage
(
'Build and deploy UserManager parent pom'
)
{
when
{
not
{
anyOf
{
branch
'master-interface-proto4'
branch
'release-interface-proto4'
}
}
}
steps
{
script
{
FAILED_STAGE
=
env
.
STAGE_NAME
...
...
@@ -89,6 +99,14 @@ pipeline {
}
stage
(
'Build and deploy UserManager'
)
{
when
{
not
{
anyOf
{
branch
'master-interface-proto4'
branch
'release-interface-proto4'
}
}
}
steps
{
script
{
FAILED_STAGE
=
env
.
STAGE_NAME
...
...
@@ -102,6 +120,14 @@ pipeline {
}
stage
(
'Build native container image'
)
{
when
{
not
{
anyOf
{
branch
'master-interface-proto4'
branch
'release-interface-proto4'
}
}
}
steps
{
script
{
FAILED_STAGE
=
env
.
STAGE_NAME
...
...
@@ -128,6 +154,14 @@ pipeline {
}
stage
(
'Deploy SBOM to DependencyTrack'
)
{
when
{
not
{
anyOf
{
branch
'master-interface-proto4'
branch
'release-interface-proto4'
}
}
}
steps
{
script
{
IMAGE_TAG
=
generateImageTag
()
...
...
@@ -172,6 +206,14 @@ pipeline {
}
stage
(
'Tag and Push Docker image'
)
{
when
{
not
{
anyOf
{
branch
'master-interface-proto4'
branch
'release-interface-proto4'
}
}
}
steps
{
script
{
FAILED_STAGE
=
env
.
STAGE_NAME
...
...
@@ -190,6 +232,14 @@ pipeline {
}
stage
(
'Test, build and deploy Helm Chart'
)
{
when
{
not
{
anyOf
{
branch
'master-interface-proto4'
branch
'release-interface-proto4'
}
}
}
steps
{
script
{
FAILED_STAGE
=
env
.
STAGE_NAME
...
...
This diff is collapsed.
Click to expand it.
pom.xml
+
1
−
1
View file @
68b53540
...
...
@@ -29,7 +29,7 @@
<parent>
<groupId>
de.ozgcloud.common
</groupId>
<artifactId>
ozgcloud-common-dependencies
</artifactId>
<version>
4.
4.0-PR-25-SNAPSHOT
</version>
<version>
4.
3.2
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
user-manager-interface/pom.xml
+
9
−
4
View file @
68b53540
...
...
@@ -24,16 +24,21 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<parent>
<groupId>
de.ozgcloud.user
</groupId>
<artifactId>
user-manager
</artifactId>
<version>
2.9.0-SNAPSHOT
</version>
<groupId>
de.ozgcloud.common
</groupId>
<artifactId>
ozgcloud-common-dependencies
</artifactId>
<version>
4.4.0-PR-25-SNAPSHOT
</version>
<relativePath/>
</parent>
<groupId>
de.ozgcloud.user
</groupId>
<artifactId>
user-manager-interface
</artifactId>
<version>
2.9_4.0-SNAPSHOT
</version>
<name>
OZG-Cloud User Manager Interface
</name>
<description>
gRPC Interface for User Manager
</description>
...
...
This diff is collapsed.
Click to expand it.
user-manager-server/pom.xml
+
1
−
0
View file @
68b53540
...
...
@@ -49,6 +49,7 @@
<dependency>
<groupId>
de.ozgcloud.user
</groupId>
<artifactId>
user-manager-interface
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
de.ozgcloud.common
</groupId>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment