[gnome-build-meta/abderrahim/ci-improvements: 19/24] .gitlab-ci.yml: don't run bst track in the cve_report job

[Abderrahim Kitouni <akitouni src gnome org>]

commit 04c6516d9d97a69016908b599d31c9743c221786
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Apr 9 12:59:04 2019 +0100

    .gitlab-ci.yml: don't run bst track in the cve_report job
    
    And pre-build the manifests. This speeds up the job.
    
    Also put the job definition at the end where it logically belongs.

 .gitlab-ci.yml | 53 ++++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79167003..d9eb788c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,7 @@ before_script:
 .build-template:
   stage: build
   script:
-    - ${BST} -o arch "${ARCH}" build core.bst flatpak-runtimes.bst
+    - ${BST} -o arch "${ARCH}" build core.bst flatpak-runtimes.bst platform-manifest.bst sdk-manifest.bst
   # Store artifacts so we can inspect build failures
   artifacts:
     when: always
@@ -147,32 +147,6 @@ before_script:
 # "Real" CI jobs
 #
 
-cve_report:
-  <<: *x86_64
-  stage: reports
-  script:
-    - pip3 install --user lxml
-
-    - ${BST} track --deps all platform-manifest.bst sdk-manifest.bst
-    - ${BST} build platform-manifest.bst
-    - ${BST} build sdk-manifest.bst
-
-    - ${BST} checkout platform-manifest.bst platform-manifest/
-    - ${BST} checkout sdk-manifest.bst sdk-manifest/
-
-    - mkdir -p "${XDG_CACHE_HOME}/cve"
-    - cd "${XDG_CACHE_HOME}/cve"
-    - python3 "${CI_PROJECT_DIR}/utils/update-local-cve-database.py"
-
-    - mkdir -p "${CI_PROJECT_DIR}/cve-reports"
-    - python3 "${CI_PROJECT_DIR}/utils/generate-cve-report.py" 
"${CI_PROJECT_DIR}/sdk-manifest/usr/manifest.json" "${CI_PROJECT_DIR}/cve-reports/sdk.html"
-    - python3 "${CI_PROJECT_DIR}/utils/generate-cve-report.py" 
"${CI_PROJECT_DIR}/platform-manifest/usr/manifest.json" "${CI_PROJECT_DIR}/cve-reports/platform.html"
-  artifacts:
-    paths:
-      - "${CI_PROJECT_DIR}/cve-reports"
-  only:
-    - master
-
 track:
   <<: *x86_64
   stage: track
@@ -267,3 +241,28 @@ flatpak-finish-failed:
     variables:
       - $EMERGENCY
   <<: *x86_64
+
+
+cve_report:
+  <<: *x86_64
+  stage: reports
+  script:
+    - pip3 install --user lxml
+
+    - ${BST} build platform-manifest.bst sdk-manifest.bst
+
+    - ${BST} checkout platform-manifest.bst platform-manifest/
+    - ${BST} checkout sdk-manifest.bst sdk-manifest/
+
+    - mkdir -p "${XDG_CACHE_HOME}/cve"
+    - cd "${XDG_CACHE_HOME}/cve"
+    - python3 "${CI_PROJECT_DIR}/utils/update-local-cve-database.py"
+
+    - mkdir -p "${CI_PROJECT_DIR}/cve-reports"
+    - python3 "${CI_PROJECT_DIR}/utils/generate-cve-report.py" 
"${CI_PROJECT_DIR}/sdk-manifest/usr/manifest.json" "${CI_PROJECT_DIR}/cve-reports/sdk.html"
+    - python3 "${CI_PROJECT_DIR}/utils/generate-cve-report.py" 
"${CI_PROJECT_DIR}/platform-manifest/usr/manifest.json" "${CI_PROJECT_DIR}/cve-reports/platform.html"
+  artifacts:
+    paths:
+      - "${CI_PROJECT_DIR}/cve-reports"
+  only:
+    - master