Dockerfile on Jenkinsfile final fix

lsst-ts · Feb 21, 2022 · 039573a · 039573a
1 parent 5527140
commit 039573a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,7 +18,6 @@ pipeline {
           branch "hotfix/*"
           branch "release/*"
           branch "tickets/*"
-          branch "PR-*"
         }
       }
       steps {
@@ -48,7 +47,6 @@ pipeline {
           branch "hotfix/*"
           branch "release/*"
           branch "tickets/*"
-          branch "PR-*"
         }
       }
       steps {
@@ -63,12 +61,18 @@ pipeline {
     stage("Run tests") {
       when {
         anyOf {
+          branch "main"
           branch "develop"
+          branch "bugfix/*"
+          branch "hotfix/*"
+          branch "release/*"
+          branch "tickets/*"
+          branch "PR-*"
         }
       }
       steps {
         script {
-          sh "docker image build -f Dockerfile-test -t love-frontend-test  ."
+          sh "docker image build -f docker/Dockerfile-test -t love-frontend-test  ."
           sh "docker run love-frontend-test"
         }
       }