Skip to content

Commit cfe7901

Browse files
pasquy73pasquy73
committed
Merge branch 'main' into harbor
2 parents f19bf1f + 849469c commit cfe7901

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎.github/workflows/build.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@ jobs:
3232
<mirror>
3333
<id>nexus</id>
3434
<mirrorOf>external:*</mirrorOf>
35-
<url>https://production.eng.it/nexus/content/groups/alm-eng-esl-mirror/
35+
<url>${{ vars.NEXUS_URL }}/content/groups/alm-eng-esl-mirror/
3636
</url>
3737
</mirror>
3838
</mirrors>
3939
<servers>
4040
<server>
4141
<id>almesl-snapshots</id>
42-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
43-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
42+
<username>${{ vars.LDAP_USERNAME }}</username>
43+
<password>${{ secrets.LDAP_PASSWORD }}</password>
4444
</server>
4545
<server>
4646
<id>almesl-releases</id>
47-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
48-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
47+
<username>${{ vars.LDAP_USERNAME }}</username>
48+
<password>${{ secrets.LDAP_PASSWORD }}</password>
4949
</server>
5050
<server>
5151
<id>nexus</id>
52-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
53-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
52+
<username>${{ vars.LDAP_USERNAME }}</username>
53+
<password>${{ secrets.LDAP_PASSWORD }}</password>
5454
</server>
5555
</servers>
5656
<profiles>
@@ -59,7 +59,7 @@ jobs:
5959
<repositories>
6060
<repository>
6161
<id>almesl-snapshots</id>
62-
<url>https://production.eng.it/nexus/content/repositories/snapshots/
62+
<url>${{ vars.NEXUS_URL }}/content/repositories/snapshots/
6363
</url>
6464
<releases>
6565
<enabled>false</enabled>
@@ -70,7 +70,7 @@ jobs:
7070
</repository>
7171
<repository>
7272
<id>almesl-releases</id>
73-
<url>https://production.eng.it/nexus/content/repositories/releases/
73+
<url>${{ vars.NEXUS_URL }}/content/repositories/releases/
7474
</url>
7575
<releases>
7676
<enabled>true</enabled>
@@ -83,7 +83,7 @@ jobs:
8383
<pluginRepositories>
8484
<pluginRepository>
8585
<id>nexus</id>
86-
<url>http://production.eng.it/nexus/content/groups/alm-eng-esl-mirror/</url>
86+
<url>${{ vars.NEXUS_URL }}/content/groups/alm-eng-esl-mirror/</url>
8787
<releases>
8888
<enabled>true</enabled>
8989
</releases>
@@ -132,25 +132,25 @@ jobs:
132132
<mirror>
133133
<id>nexus</id>
134134
<mirrorOf>external:*</mirrorOf>
135-
<url>https://production.eng.it/nexus/content/groups/alm-eng-esl-mirror/
135+
<url>${{ vars.NEXUS_URL }}/content/groups/alm-eng-esl-mirror/
136136
</url>
137137
</mirror>
138138
</mirrors>
139139
<servers>
140140
<server>
141141
<id>almesl-snapshots</id>
142-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
143-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
142+
<username>${{ vars.LDAP_USERNAME }}</username>
143+
<password>${{ secrets.LDAP_PASSWORD }}</password>
144144
</server>
145145
<server>
146146
<id>almesl-releases</id>
147-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
148-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
147+
<username>${{ vars.LDAP_USERNAME }}</username>
148+
<password>${{ secrets.LDAP_PASSWORD }}</password>
149149
</server>
150150
<server>
151151
<id>nexus</id>
152-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
153-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
152+
<username>${{ vars.LDAP_USERNAME }}</username>
153+
<password>${{ secrets.LDAP_PASSWORD }}</password>
154154
</server>
155155
</servers>
156156
<profiles>
@@ -159,7 +159,7 @@ jobs:
159159
<repositories>
160160
<repository>
161161
<id>almesl-snapshots</id>
162-
<url>https://production.eng.it/nexus/content/repositories/snapshots/
162+
<url>${{ vars.NEXUS_URL }}/content/repositories/snapshots/
163163
</url>
164164
<releases>
165165
<enabled>false</enabled>
@@ -170,7 +170,7 @@ jobs:
170170
</repository>
171171
<repository>
172172
<id>almesl-releases</id>
173-
<url>https://production.eng.it/nexus/content/repositories/releases/
173+
<url>${{ vars.NEXUS_URL }}/content/repositories/releases/
174174
</url>
175175
<releases>
176176
<enabled>true</enabled>
@@ -183,7 +183,7 @@ jobs:
183183
<pluginRepositories>
184184
<pluginRepository>
185185
<id>nexus</id>
186-
<url>http://production.eng.it/nexus/content/groups/alm-eng-esl-mirror/</url>
186+
<url>${{ vars.NEXUS_URL }}/content/groups/alm-eng-esl-mirror/</url>
187187
<releases>
188188
<enabled>true</enabled>
189189
</releases>

‎.github/workflows/harbor.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: ["harbor"]
66

77
env:
8-
REPOSITORY: production.eng.it:8433 # URL Harbor
8+
REPOSITORY: ${{ vars.HARBOR_REPO }} # URL Harbor -> set in github variables
99
IMAGE_NAME: billing-proxy
1010

1111
jobs:
@@ -36,25 +36,25 @@ jobs:
3636
<mirror>
3737
<id>nexus</id>
3838
<mirrorOf>external:*</mirrorOf>
39-
<url>https://production.eng.it/nexus/content/groups/alm-eng-esl-mirror/
39+
<url>${{ vars.NEXUS_URL }}/content/groups/alm-eng-esl-mirror/
4040
</url>
4141
</mirror>
4242
</mirrors>
4343
<servers>
4444
<server>
4545
<id>almesl-snapshots</id>
46-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
47-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
46+
<username>${{ vars.LDAP_USERNAME }}</username>
47+
<password>${{ secrets.LDAP_PASSWORD }}</password>
4848
</server>
4949
<server>
5050
<id>almesl-releases</id>
51-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
52-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
51+
<username>${{ vars.LDAP_USERNAME }}</username>
52+
<password>${{ secrets.LDAP_PASSWORD }}</password>
5353
</server>
5454
<server>
5555
<id>nexus</id>
56-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
57-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
56+
<username>${{ vars.LDAP_USERNAME }}</username>
57+
<password>${{ secrets.LDAP_PASSWORD }}</password>
5858
</server>
5959
</servers>
6060
<profiles>
@@ -63,7 +63,7 @@ jobs:
6363
<repositories>
6464
<repository>
6565
<id>almesl-snapshots</id>
66-
<url>https://production.eng.it/nexus/content/repositories/snapshots/
66+
<url>${{ vars.NEXUS_URL }}/content/repositories/snapshots/
6767
</url>
6868
<releases>
6969
<enabled>false</enabled>
@@ -74,7 +74,7 @@ jobs:
7474
</repository>
7575
<repository>
7676
<id>almesl-releases</id>
77-
<url>https://production.eng.it/nexus/content/repositories/releases/
77+
<url>${{ vars.NEXUS_URL }}/content/repositories/releases/
7878
</url>
7979
<releases>
8080
<enabled>true</enabled>
@@ -87,7 +87,7 @@ jobs:
8787
<pluginRepositories>
8888
<pluginRepository>
8989
<id>nexus</id>
90-
<url>http://production.eng.it/nexus/content/groups/alm-eng-esl-mirror/</url>
90+
<url>${{ vars.NEXUS_URL }}/content/groups/alm-eng-esl-mirror/</url>
9191
<releases>
9292
<enabled>true</enabled>
9393
</releases>
@@ -145,25 +145,25 @@ jobs:
145145
<mirror>
146146
<id>nexus</id>
147147
<mirrorOf>external:*</mirrorOf>
148-
<url>https://production.eng.it/nexus/content/groups/alm-eng-esl-mirror/
148+
<url>${{ vars.NEXUS_URL }}/content/groups/alm-eng-esl-mirror/
149149
</url>
150150
</mirror>
151151
</mirrors>
152152
<servers>
153153
<server>
154154
<id>almesl-snapshots</id>
155-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
156-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
155+
<username>${{ vars.LDAP_USERNAME }}</username>
156+
<password>${{ secrets.LDAP_PASSWORD }}</password>
157157
</server>
158158
<server>
159159
<id>almesl-releases</id>
160-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
161-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
160+
<username>${{ vars.LDAP_USERNAME }}</username>
161+
<password>${{ secrets.LDAP_PASSWORD }}</password>
162162
</server>
163163
<server>
164164
<id>nexus</id>
165-
<username>${{ vars.ENG_LDAP_USERNAME }}</username>
166-
<password>${{ secrets.ENG_LDAP_PASSWORD }}</password>
165+
<username>${{ vars.LDAP_USERNAME }}</username>
166+
<password>${{ secrets.LDAP_PASSWORD }}</password>
167167
</server>
168168
</servers>
169169
<profiles>
@@ -172,7 +172,7 @@ jobs:
172172
<repositories>
173173
<repository>
174174
<id>almesl-snapshots</id>
175-
<url>https://production.eng.it/nexus/content/repositories/snapshots/
175+
<url>${{ vars.NEXUS_URL }}/content/repositories/snapshots/
176176
</url>
177177
<releases>
178178
<enabled>false</enabled>
@@ -183,7 +183,7 @@ jobs:
183183
</repository>
184184
<repository>
185185
<id>almesl-releases</id>
186-
<url>https://production.eng.it/nexus/content/repositories/releases/
186+
<url>${{ vars.NEXUS_URL }}/content/repositories/releases/
187187
</url>
188188
<releases>
189189
<enabled>true</enabled>
@@ -196,7 +196,7 @@ jobs:
196196
<pluginRepositories>
197197
<pluginRepository>
198198
<id>nexus</id>
199-
<url>http://production.eng.it/nexus/content/groups/alm-eng-esl-mirror/</url>
199+
<url>${{ vars.NEXUS_URL }}/content/groups/alm-eng-esl-mirror/</url>
200200
<releases>
201201
<enabled>true</enabled>
202202
</releases>

‎src/main/resources/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ billing:
4949

5050
# TMForum Endpoints
5151
tmforumapi:
52-
tmf_endpoint: ${TMF_ENDPOINT:https://dome-dev.eng.it}
52+
tmf_endpoint: ${TMF_ENDPOINT:http://tm-forum-api}
5353

5454
# tmf_envoy = false => use specific path for any tmforum software | tmf_envoy = true => use TMF_ENDPOINT as unique path (proxy)
5555
tmf_envoy: ${TMF_ENVOY:true}

0 commit comments

Comments
 (0)