Merge pull request #41 from Amsterdam/feature/release-automation

Fix jenkinsfile to deploy tags starting with v prefix
Amsterdam · Jul 5, 2021 · 348ff4a · 348ff4a
2 parents 41416cb + edd0db6
commit 348ff4a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -72,9 +72,7 @@ pipeline {
         }
 
         stage('Deploy to production') {
-            when {
-                tag pattern: "^(?i)\\d+\\.\\d+\\.\\d+(?!-rc.*)", comparator: "REGEXP"
-            }
+            when { tag pattern: "v\\d+\\.\\d+\\.\\d+\\.*", comparator: "REGEXP" }
             steps {
                 sh 'VERSION=production make push'
                 build job: 'Subtask_Openstack_Playbook', parameters: [

diff --git a/src/project/admin.py b/src/project/admin.py
@@ -33,7 +33,6 @@ class ProjectAdmin(admin.ModelAdmin):
         'project_number',
         'team',
         'customer',
-        'support_contract_status',
     )
     list_filter = ['team', 'project_status', 'personal_data_status']
     radio_fields = {