Clean-up pipeline

Remove unused variables. Move apt action to before_script. Add correct dependencies between build and upload jobs.

Signed-off-by: Frédéric Danis frederic.danis@collabora.com

.gitlab-ci.yml

 # vi:et:sts=2
 
 variables:
-  FULLNAME: ${GITLAB_USER_NAME}
-  EMAIL: ${GITLAB_USER_EMAIL}
-  CI_AUTH_PROJECT_URL: https://${GITLAB_CI_USER}:${GITLAB_CI_PASSWORD}@gitlab.apertis.org/${CI_PROJECT_PATH}.git/
   FLATDEB_PROJECT_URL: https://gitlab.apertis.org/infrastructure/apertis-flatdeb.git
-  GBP_CONF_FILES: "/dev/null"
-  # Disable shallow clone as history is needed for describing tags
-  GIT_DEPTH: 0
-  LICENSE_BLACKLIST: ""
   APERTIS_RELEASE: "v2021dev1"
 
 image: docker-registry.apertis.org/apertis/apertis-${APERTIS_RELEASE}-package-builder
@@ -24,10 +17,10 @@ build-runtime:
     GIT_STRATEGY: clone
   stage: build runtime
   before_script:
-    - mkdir -p _build_runtime/
-  script:
     - apt update
     - apt install -y binutils debootstrap debos flatpak ostree pigz python3 python3-debian python3-gi python3-yaml systemd-container time flatpak-builder
+    - mkdir -p _build_runtime/
+  script:
     - git clone --branch apertis/${APERTIS_RELEASE} --depth 1 ${FLATDEB_PROJECT_URL}
     - apertis-flatdeb/run.py --suite=${APERTIS_RELEASE} --arch=amd64 base
     - apertis-flatdeb/run.py --suite=${APERTIS_RELEASE} --arch=amd64 runtimes runtimes/org.apertis.demo.yaml
@@ -47,6 +40,8 @@ upload-runtime:
   stage: upload runtime
   script:
     - './upload.sh _build_runtime/flatdeb/ostree-repo/. runtime'
+  dependencies:
+    - build-runtime
   rules:
     - if: '$ARCHIVE_SECRET_FILE'
       when: on_success
@@ -55,16 +50,15 @@ upload-runtime:
 build-app:
   variables:
     GIT_STRATEGY: clone
-    REMOTE_URL: https://images.apertis.org/test/flatpak/runtime
+    REMOTE_URL: https://images.apertis.org/public/flatpak/runtime
   stage: build app
   before_script:
-    - mkdir -p _build_app/
-  script:
     - apt update
     - apt install -y binutils debootstrap debos flatpak ostree pigz python3 python3-debian python3-gi python3-yaml systemd-container time flatpak-builder
+    - mkdir -p _build_app/
+  script:
     - git clone --branch apertis/${APERTIS_RELEASE} --depth 1 ${FLATDEB_PROJECT_URL}
     - apertis-flatdeb/run.py --remote-url="${REMOTE_URL}" --suite=${APERTIS_RELEASE} --arch=amd64 app apps/org.apertis.demo.curl.yaml
-    - rm -rf _build/flatdeb
     - mv ~/.cache/flatdeb _build_app/.
   artifacts:
     paths:
@@ -81,6 +75,8 @@ upload-app:
   stage: upload app
   script:
     - './upload.sh _build_app/flatdeb/ostree-repo/. app'
+  dependencies:
+    - build-app
   rules:
     - if: '$ARCHIVE_SECRET_FILE'
       when: on_success