From edd0db675be8282209c4026a4803bdfeef1f907d Mon Sep 17 00:00:00 2001
From: Niels Lensink <nielslensink@gmail.com>
Date: Mon, 5 Jul 2021 12:56:17 +0200
Subject: [PATCH] Fix jenkinsfile to deploy tags starting with v prefix

---
 Jenkinsfile          | 4 +---
 src/project/admin.py | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 29068b8..cedfc2e 100644
--- 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
index d07c716..7af72bf 100644
--- 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 = {