Skip to content

Commit 9e0105d

Browse files
vialogigalnoam
authored andcommitted
[CI] issue: HPCINFRA-2760 Update Webrepo URL to GeoDNS URL
We use webrepo URL in Release CI on both Prod and PDC sites. We'd like to unify URL we use for Webrepo to simplify the pipelines Issue: HPCINFRA-2760 Signed-off-by: Viacheslav Login <[email protected]>
1 parent ae2ada7 commit 9e0105d

File tree

4 files changed

+5
-67
lines changed

4 files changed

+5
-67
lines changed

.ci/dockerfiles/Dockerfile.rhel8.6.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG HARBOR_URL=nbu-harbor.gtm.nvidia.com
22
FROM $HARBOR_URL/hpcx/x86_64/rhel8.6/core:latest
3-
ARG WEBREPO_URL=webrepo.mtr.labs.mlnx
3+
ARG WEBREPO_URL=webrepo.gtm.nvidia.com
44
ARG _UID=6213
55
ARG _GID=101
66
ARG _LOGIN=swx-jenkins

.ci/pipeline/dr_weekly_matrix.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ steps:
4242
shell: action
4343
module: groovy
4444
run: |
45-
def job = Jenkins.instance.getItemByFullName('libxlio/LibXLIO-release-dr')
45+
def job = Jenkins.instance.getItemByFullName('libxlio/LibXLIO-release')
4646
if (!job.isBuildable()) {
4747
echo "The job '${env.JOB}' is disabled. Enabling..."
4848
job.setDisabled(false)
@@ -55,7 +55,7 @@ steps:
5555
run: |
5656
echo "Release tag we're building on: ${env.RELEASE_TAG}"
5757
if (env.RELEASE_TAG) {
58-
def build = build job: 'libxlio/LibXLIO-release-dr',
58+
def build = build job: 'libxlio/LibXLIO-release',
5959
parameters: [
6060
string(name: 'release_tag', value: RELEASE_TAG),
6161
string(name: 'release_folder', value: "${release_folder}"),

.ci/pipeline/release_jjb.yaml

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -12,67 +12,6 @@
1212
keep-system-variables: true
1313
properties-content: |
1414
jjb_proj={jjb_proj}-release
15-
WEBREPO_URL=webrepo.mtr.labs.mlnx
16-
description: Do NOT edit this job through the Web GUI !
17-
concurrent: false
18-
parameters:
19-
- string:
20-
name: "release_tag"
21-
default: ""
22-
description: "Tag to release"
23-
- string:
24-
name: sha1
25-
default: 'tags/$release_tag'
26-
description: 'commit to use, defaults to the commit tag provided under release_tag'
27-
- string:
28-
name: "revision"
29-
default: "1"
30-
description: "Release revision"
31-
- string:
32-
name: "release_folder"
33-
default: "{jjb_release_folder}"
34-
description: "Folder to release packages into"
35-
- bool:
36-
name: "do_release"
37-
default: true
38-
description: "Release build packges into the release folder, set to false for debugging"
39-
- string:
40-
name: "notification_email"
41-
default: "{jjb_release_email}"
42-
description: "Email to send report to upon success/failure"
43-
- string:
44-
name: "conf_file"
45-
default: ".ci/pipeline/release_matrix_job.yaml"
46-
description: "job config file. Do not change it"
47-
pipeline-scm:
48-
scm:
49-
- git:
50-
url: "{jjb_git}"
51-
credentials-id: 'swx-jenkins_ssh_key'
52-
branches: ['$sha1']
53-
shallow-clone: true
54-
depth: 2
55-
refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
56-
browser: githubweb
57-
browser-url: "{jjb_git}"
58-
script-path: ".ci/Jenkinsfile"
59-
60-
- job-template:
61-
name: "{jjb_proj}-release-dr"
62-
project-type: pipeline
63-
folder: "{jjb_folder}"
64-
disabled: true
65-
properties:
66-
- github:
67-
url: "https://github.com/Mellanox/libxlio"
68-
- build-discarder:
69-
days-to-keep: 120
70-
num-to-keep: 20
71-
- inject:
72-
keep-system-variables: true
73-
properties-content: |
74-
jjb_proj={jjb_proj}-release-dr
75-
WEBREPO_URL=l-pxe02_pune.nvidia.com
7615
description: Do NOT edit this job through the Web GUI !
7716
concurrent: false
7817
parameters:
@@ -127,4 +66,3 @@
12766
jjb_release_email: '[email protected]'
12867
jobs:
12968
- "{jjb_proj}-release"
130-
- "{jjb_proj}-release-dr"

.ci/pipeline/release_matrix_job.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ runs_on_dockers:
2727
file: '.ci/dockerfiles/Dockerfile.rhel8.6.release',
2828
name: 'rhel8.6',
2929
uri: '$arch/$name/release',
30-
build_args: '--no-cache --build-arg WEBREPO_URL=$WEBREPO_URL',
30+
build_args: '--no-cache',
3131
arch: 'x86_64',
32-
tag: '20241028'
32+
tag: '20250128'
3333
}
3434

3535

0 commit comments

Comments
 (0)