Compare commits

...

22 Commits

Author SHA1 Message Date
Marc Mattmüller c258d09eb5 Merge branch 'develop' into ansible-instance 2023-09-19 16:10:19 +02:00
Marc Mattmüller 3d3ed9bf9e Merge branch 'develop' into ansible-instance 2023-09-18 16:52:54 +02:00
Marc Mattmüller e2bf5b4140 Merge branch 'develop' into ansible-instance 2023-09-18 12:37:18 +02:00
Marc Mattmüller 348149f6b1 Merge branch 'develop' into ansible-instance 2023-09-18 11:42:30 +02:00
Marc Mattmüller cccc0538a0 Merge branch 'develop' into ansible-instance 2023-09-12 15:50:28 +02:00
Marc Mattmüller 7a103e7eae Merge branch 'develop' into ansible-instance 2023-09-12 14:41:35 +02:00
Marc Mattmüller 57873d15cd Merge branch 'develop' into ansible-instance 2023-09-12 12:52:06 +02:00
Marc Mattmüller 1e739d0817 Merge branch 'develop' into ansible-instance 2023-09-11 16:12:58 +02:00
Marc Mattmüller 717b4ed219 Merge branch 'develop' into ansible-instance 2023-09-11 13:40:34 +02:00
Marc Mattmüller 4f92abff9c Merge branch 'develop' into ansible-instance 2023-09-11 12:05:03 +02:00
Marc Mattmüller 1100d2da3a Merge branch 'develop' into ansible-instance 2023-09-11 10:49:04 +02:00
Marc Mattmüller baa0da13a2 Merge branch 'develop' into ansible-instance 2023-09-05 15:02:30 +02:00
Marc Mattmüller 49fcf8f854 jobs/common: remove duplicated function due to merging
Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
2023-09-04 13:52:20 +02:00
Marc Mattmüller 0d1367c06f docker/nwl-cicd.yaml: set default branch parameter value to ansible-instance
Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
2023-09-04 13:47:52 +02:00
Marc Mattmüller ff7b28774a Merge branch 'develop' into ansible-instance 2023-09-04 13:41:22 +02:00
Marc Mattmüller d57b6804d6 Merge branch 'develop' into ansible-instance 2023-09-04 12:36:59 +02:00
Marc Mattmüller 225319fe69 Merge branch 'develop' into ansible-instance 2023-09-04 10:42:59 +02:00
Marc Mattmüller 957dc52132 jobs/buildAll: fixed build yocto job name and added clean-up of repo
with all the changes we have had regarding seed job integration in
the HAC instance the job name changed. Thus, fixing the name when
triggering the build job.
Additionally the script updating the source revisions leaves some
unstaged changes which is resolved by adding the clean-up of the
repository after building all targets.

Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
2023-08-29 09:04:55 +02:00
Marc Mattmüller 0a2a6685ea jobs/buildTarget: added post step cleaning repository
the post step cleans the residuals from the update of the source
revisions.

Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
2023-08-29 09:04:55 +02:00
Marc Mattmüller 22b6e0adc4 jobs/common: added cleanup function restoring unstaged changes
with the script updating the source revisions some unstaged
changes reside in the repository. A following job will be unable
to succeed as the clone will fail. Thus, adding this function
which now can be used in the specific jobs.

Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
2023-08-29 09:04:55 +02:00
Marc Mattmüller 1f425845ad jobs/seed: added doc job and set git credentials for ansible instance
Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
2023-08-28 18:32:59 +02:00
Marc Mattmüller 6eef9775a3 docker/nwl-cicd.yaml: set branch ansible-instance as default
the ansible-seed branch shall be the default. For branch develop
and main, we leave main as default branch to seed. The reason is
because of different jobs to seed and different IDs for the git
credentials.

Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
2023-08-28 18:28:07 +02:00
2 changed files with 44 additions and 6 deletions

View File

@ -83,7 +83,7 @@ tool:
jobs:
- script: >
SEEDING_BRANCH = 'main'
SEEDING_BRANCH = 'ansible-instance'
freeStyleJob('Seed Job') {
scm {
@ -99,7 +99,7 @@ jobs:
}
}
parameters {
stringParam('SEEDING_BRANCH', 'main', "The branch to seed the jobs from, e.g. develop or main")
stringParam('SEEDING_BRANCH', 'ansible-instance', "The branch to seed the jobs from, e.g. develop or main")
}
steps {
shell('git checkout $SEEDING_BRANCH')

View File

@ -33,7 +33,7 @@ pipelineJob('nwl') {
}
}
remote {
credentials('nmgit_credentials')
credentials('gitCredentials')
url('ssh://git@bitbucket.gad.local:7999/nm-nsp/nwl-ci.git')
}
}
@ -69,7 +69,7 @@ pipelineJob('nwl-target') {
}
}
remote {
credentials('nmgit_credentials')
credentials('gitCredentials')
url('ssh://git@bitbucket.gad.local:7999/nm-nsp/nwl-ci.git')
}
}
@ -79,7 +79,6 @@ pipelineJob('nwl-target') {
}
}
pipelineJob('nwl-update-src-rev') {
def branchToUse = binding.variables.get("SEEDING_BRANCH")
@ -106,7 +105,7 @@ pipelineJob('nwl-update-src-rev') {
}
}
remote {
credentials('nmgit_credentials')
credentials('gitCredentials')
url('ssh://git@bitbucket.gad.local:7999/nm-nsp/nwl-ci.git')
}
}
@ -115,3 +114,42 @@ pipelineJob('nwl-update-src-rev') {
}
}
}
pipelineJob('doc') {
def branchToUse = binding.variables.get("SEEDING_BRANCH")
displayName('Documentation')
description('Builds the Documentation of the work concerning NWL CI')
authorization {
permissionAll('anonymous')
}
authenticationToken('buildDocToken')
logRotator {
artifactDaysToKeep(7)
artifactNumToKeep(7)
daysToKeep(7)
numToKeep(7)
}
properties {
disableConcurrentBuilds()
}
definition {
cpsScm {
scm {
git {
branches(branchToUse)
extensions {
cloneOptions {
depth(1)
}
}
remote {
credentials('gitCredentials')
url('ssh://git@bitbucket.gad.local:7999/nm-nsp/nwl-ci.git')
}
}
scriptPath('jobs/Jenkinsfile_Documentation')
}
}
}
}