[gnome-build-meta/sthursfield/james/openqa-master] TEMP: Remove more stuff

[Sam Thursfield <sthursfield src gnome org>]

commit da75b0999ea494606c86cdd9798486b4f862bdda
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Jul 28 11:51:22 2021 +0200

    TEMP: Remove more stuff

 .gitlab-ci.yml | 158 +++++++++------------------------------------------------
 1 file changed, 25 insertions(+), 133 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33e3d813..f64d7a53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,7 @@ default:
   - echo "$GITLAB_CAS_PUSH_CERT" > client.crt
   - echo "$GITLAB_CAS_PUSH_KEY" > client.key
 
+
 #
 # Templates shared by multiple jobs
 #
@@ -77,6 +78,30 @@ default:
     expire_in: '2 days'
 
 
+#
+# "Real" CI jobs
+#
+
+track:
+  extends: .x86_64
+  stage: track
+  interruptible: true
+  script:
+  - 'sed -i "s/track-tags: false/track-tags: ${BST_TRACK_TAGS}/" project.conf'
+  # FIXME: pbp image breaks the build https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/371
+  # - ${BST} track --deps all core.bst flatpak-runtimes.bst vm/image.bst boards/pinebook-pro/image.bst 
boards/rock64/image.bst boards/raspberrypi-4/image.bst vm/repo-devel.bst iso/image.bst
+  - ${BST} track --deps all core.bst flatpak-runtimes.bst vm/image.bst boards/rock64/image.bst 
boards/raspberrypi-4/image.bst vm/repo-devel.bst iso/image.bst
+  - echo $CI_JOB_ID > track-job.id
+  retry: 2
+  # only run on branches targeting master
+  rules:
+  - if: $FLATPAK_BRANCH == 'master' && $CI_MERGE_REQUEST_ID == null
+  artifacts:
+    paths:
+    - project.refs
+    - track-job.id
+
+
 build-x86_64:
   extends:
   - .build-template
@@ -102,8 +127,6 @@ test-iso-installer-x86_64:
   variables:
     IMAGE: iso/image.bst
   needs:
-  - job: 'track'
-    optional: true
   - job: 'iso-installer-x86_64'
     artifacts: true
   script:
@@ -179,134 +202,3 @@ test-iso-installer-x86_64:
   tags:
   - x86_64
   - gnome-build-meta
-
-s3-image:
-  extends: .x86_64
-  stage: deploy
-  needs:
-  - job: 'track'
-    optional: true
-  - job: 'build-x86_64'
-    artifacts: false
-  script:
-  - ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build vm/image.bst iso/image.bst
-  - ${BST} -o arch "${ARCH}" checkout --hardlinks vm/image.bst image
-  - ${BST} -o arch "${ARCH}" checkout --hardlinks iso/image.bst iso
-
-  - |
-    if [ -n "$CI_COMMIT_TAG" ]; then
-        aws s3 cp --acl public-read iso/installer.iso \
-            s3://gnome-build-meta/tag/$CI_COMMIT_TAG/gnome_os_installer_$CI_COMMIT_TAG.iso
-    else
-        aws s3 cp --acl public-read image/disk.img.xz \
-            s3://gnome-build-meta/nightly/$CI_PIPELINE_ID/disk_$CI_PIPELINE_ID.img.xz
-        aws s3 cp --acl public-read iso/installer.iso \
-            s3://gnome-build-meta/nightly/$CI_PIPELINE_ID/gnome_os_installer_$CI_PIPELINE_ID.iso
-    fi
-
-  - aws s3 ls --recursive --human-readable s3://gnome-build-meta/
-
-  rules:
-  - if: $EMERGENCY || $BST_TRACK_TAGS != "false"
-    when: never
-  - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule"
-  - if: $CI_COMMIT_TAG
-
-openh264-x86_64:
-  extends:
-  - .x86_64
-  stage: deploy
-  needs: []
-  allow_failure: true
-  rules:
-  - if: $EMERGENCY || $BST_TRACK_TAGS != "false"
-    when: never
-  - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule"
-    when: manual
-  script:
-  - git clone https://gitlab.com/freedesktop-sdk/openh264-extension.git
-  - cd openh264-extension
-  - bst build flatpak-repo.bst
-  - bst checkout flatpak-repo.bst repo
-  - BUILD_ID=$(flat-manager-client create https://nightly.gnome.org/ nightly)
-  - flat-manager-client push --commit --publish --wait $BUILD_ID repo/ $(ostree --repo=repo/ refs) || 
result=$?
-  - flat-manager-client purge $BUILD_ID
-  - exit $result
-
-
-s3-image-static:
-  extends: .x86_64
-  stage: reports
-  needs:
-  - job: s3-image
-    artifacts: false
-  allow_failure: true
-  rules:
-  - if: $EMERGENCY || $BST_TRACK_TAGS != "false"
-    when: never
-  - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule"
-    when: manual
-  script:
-  - |
-    echo nightly/$CI_PIPELINE_ID/gnome_os_installer_$CI_PIPELINE_ID.iso > latest-iso
-    echo nightly/$CI_PIPELINE_ID/disk_$CI_PIPELINE_ID.img.xz > latest-disk
-  - |
-    aws s3 cp --acl public-read latest-iso s3://gnome-build-meta/latest-iso
-    aws s3 cp --acl public-read latest-disk s3://gnome-build-meta/latest-disk
-
-  - aws s3 ls --recursive --human-readable s3://gnome-build-meta/
-
-ostree-x86_64:
-  extends:
-  - .ostree-template
-  - .x86_64
-  needs:
-  - job: 'track'
-    optional: true
-  - job: 'build-x86_64'
-    artifacts: false
-
-
-cve_report:
-  extends: .x86_64
-  stage: 'deploy'
-  needs:
-  - job: 'track'
-    optional: true
-  - job: 'build-x86_64'
-    artifacts: false
-  script:
-  - ${BST} pull flatpak/platform-manifest.bst flatpak/sdk-manifest.bst
-
-  - ${BST} checkout flatpak/platform-manifest.bst platform-manifest/
-  - ${BST} checkout flatpak/sdk-manifest.bst sdk-manifest/
-
-  - mkdir -p cve
-  - cd cve
-  - ../utils/update-local-cve-database.py
-
-  - mkdir -p ../cve-reports
-  - ../utils/generate-cve-report.py ../sdk-manifest/usr/manifest.json ../cve-reports/sdk.html
-  - ../utils/generate-cve-report.py ../platform-manifest/usr/manifest.json ../cve-reports/platform.html
-  cache:
-    key: cve
-    paths:
-    - cve
-  artifacts:
-    paths:
-    - cve-reports
-  rules:
-  - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d\d$/
-
-pages:
-  stage: 'reports'
-  needs:
-    - job : 'cve_report'
-      artifacts: true
-  script:
-    - 'mv cve-reports/ public/'
-  artifacts:
-    paths:
-    - 'public'
-  rules:
-  - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d\d$/