Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
@Library('lib-jenkins-pipeline') _


def newTagEveryRunMainBranch = "yes" // Force a new version and deploy clicking on Build Now in Jenkins
def sbtOnMain = "yes"
def sbtCommand = "sbt clean flowLint coverage test scalafmtSbtCheck scalafmtCheck doc && sbt coverageAggregate"


// we can remove the pod_template block if we end up having only one template
// in jenkins config
//
Expand All @@ -28,7 +25,7 @@ podTemplate(

// => tagging function to identify what actions to take depending on the nature of the changes
stage ('tagging') {
semversion = taggingv2(newTagEveryMainRun: "${newTagEveryRunMainBranch}")
semversion = taggingv2()
println(semversion)
}

Expand Down
4 changes: 3 additions & 1 deletion deploy/dependency-api/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
labels:
team: foundation
spec:
destination:
namespace: production
Expand Down Expand Up @@ -46,7 +48,7 @@ spec:
helm:
parameters:
- name: deployments.live.version
value: "0.10.33"
value: "Jenkins_will_update_the_version"
valueFiles:
- $values/deploy/dependency-api/values.yaml
project: production
Expand Down
4 changes: 3 additions & 1 deletion deploy/dependency-www/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
labels:
team: foundation
spec:
destination:
namespace: production
Expand Down Expand Up @@ -46,7 +48,7 @@ spec:
helm:
parameters:
- name: deployments.live.version
value: "0.10.33"
value: "Jenkins_will_update_the_version"
valueFiles:
- $values/deploy/dependency-www/values.yaml
project: production
Expand Down