From 348d80664d5e966c93516e73dc4c36b9a02bf921 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 20 May 2020 15:44:56 +0200 Subject: [PATCH] Add needs keyword --- .gitlab/ci/install.gitlab-ci.yml | 15 +++++++++++++-- .gitlab/ci/test.gitlab-ci.yml | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/install.gitlab-ci.yml b/.gitlab/ci/install.gitlab-ci.yml index 664fc66d5..8363b6e58 100644 --- a/.gitlab/ci/install.gitlab-ci.yml +++ b/.gitlab/ci/install.gitlab-ci.yml @@ -1,15 +1,26 @@ +.install-stage: + stage: install + needs: + - job: build-yunohost + artifacts: true + - job: build-ssowat + artifacts: true + - job: build-moulinette + artifacts: true + ######################################## # INSTALL DEB ######################################## upgrade: - stage: install + extends: .install-stage image: "after-install" script: - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb + install-postinstall: - stage: install + extends: .install-stage image: "before-install" script: - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index dcc1b2d94..fde96e5ff 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -12,6 +12,14 @@ paths: - src/yunohost/tests/apps key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG" + needs: + - job: build-yunohost + artifacts: true + - job: build-ssowat + artifacts: true + - job: build-moulinette + artifacts: true + - job: upgrade ######################################## # TESTS @@ -29,6 +37,13 @@ full-tests: - py.test tests - cd src/yunohost - py.test tests + needs: + - job: build-yunohost + artifacts: true + - job: build-ssowat + artifacts: true + - job: build-moulinette + artifacts: true root-tests: extends: .test-stage