From 6b063719130b3204d40c678670cb6ae5b70a18c2 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Wed, 13 Oct 2021 12:27:26 +0200 Subject: [PATCH] Use OBS built container as CI base to provide all dependencies --- .circleci/config.yml | 14 ++------------ container/Dockerfile | 4 ++++ 2 files changed, 6 insertions(+), 12 deletions(-) create mode 100644 container/Dockerfile diff --git a/.circleci/config.yml b/.circleci/config.yml index a495dacc..bf8f6c98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,30 +3,20 @@ version: 2.1 jobs: unit: docker: - - image: registry.opensuse.org/opensuse/leap:15.5 + - image: registry.opensuse.org/devel/openqa/openqa-trigger-from-obs/containers/openqa-trigger-from-obs-dev steps: - checkout - - run: - command: | - zypper -n in --no-recommends diffutils make python3 tar git-core - - checkout - - run: git clean -df - run: make test_regen_all - run: make test style: docker: - - image: registry.opensuse.org/opensuse/tumbleweed + - image: registry.opensuse.org/devel/openqa/openqa-trigger-from-obs/containers/openqa-trigger-from-obs-dev steps: - checkout - - run: - command: | - zypper -n in --no-recommends make python3-black python3-importlib-metadata - - checkout - run: make test_python_style workflows: - version: 2.1 test: jobs: - unit diff --git a/container/Dockerfile b/container/Dockerfile new file mode 100644 index 00000000..1940f51a --- /dev/null +++ b/container/Dockerfile @@ -0,0 +1,4 @@ +#!BuildTag: openqa-trigger-from-obs-dev +#!UseOBSRepositories +FROM opensuse/tumbleweed +RUN zypper -n in --no-recommends diffutils tar make git-core python3-black