diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 167f5d5619..64aaaf3efb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: include: - local: .gitlab/build.yml - local: .gitlab/cdrouter.yml - - local: .gitlab/cdrouter/glinet-b1300.yml - local: .gitlab/cdrouter/turris-omnia.yml - local: .gitlab/coverity.yml - local: .gitlab/docker.yml @@ -12,8 +11,6 @@ include: - local: .gitlab/docker/testbed/gitlab.yml - local: .gitlab/docker/sdk/gitlab.yml - local: .gitlab/testbed.yml - - local: .gitlab/testbed/nec-wx3000hp.yml - - local: .gitlab/testbed/glinet-b1300.yml - local: .gitlab/testbed/turris-omnia.yml stages: @@ -28,12 +25,6 @@ stages: - cdrouter - coverity -.build test intel_mips prpl webui: - extends: .build test config - -build test ipq40xx prpl webui: - extends: .build test config - build test mvebu prpl webui: extends: .build test config @@ -43,18 +34,6 @@ build test x86_64 prpl webui: CI_BUILD_CONFIG: > +DEVEL +BUILD_LOG +SDK +IB +IB_STANDALONE -.run test NEC WX3000HP NAND: - needs: - - job: build test intel_mips prpl webui - optional: true - extends: .nec-wx3000hp testbed - -run test Gl.iNet B1300 initramfs: - needs: - - job: build test ipq40xx prpl webui - optional: true - extends: .glinet-b1300 testbed - run test Turris Omnia initramfs: needs: - job: build test mvebu prpl webui diff --git a/.gitlab/docker/sdk/gitlab.yml b/.gitlab/docker/sdk/gitlab.yml index 87f425cdcc..ce801ad8b9 100644 --- a/.gitlab/docker/sdk/gitlab.yml +++ b/.gitlab/docker/sdk/gitlab.yml @@ -1,43 +1,3 @@ -.build Docker image sdk-intel_mips-xrx500: - stage: docker SDK - needs: ["build test intel_mips prpl webui"] - variables: - DOCKER_DOCKERFILE_PATH: .gitlab/docker/sdk - DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH - extends: .build Docker image - before_script: - - tar xf bin/targets/intel_mips/xrx500/openwrt-sdk-intel_mips-xrx500_gcc-*_musl.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk - -.test Docker image sdk-intel_mips-xrx500: - extends: .test Docker SDK image - needs: ["build Docker image sdk-intel_mips-xrx500"] - -.deploy Docker image sdk-intel_mips-xrx500: - stage: docker SDK deploy - extends: .deploy Docker image - needs: ["test Docker image sdk-intel_mips-xrx500"] - - -build Docker image sdk-ipq40xx-generic: - stage: docker SDK - needs: ["build test ipq40xx prpl webui"] - variables: - DOCKER_DOCKERFILE_PATH: .gitlab/docker/sdk - DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH - extends: .build Docker image - before_script: - - tar xf bin/targets/ipq40xx/generic/openwrt-sdk-ipq40xx-generic_gcc*.Linux-x86_64.tar.xz --strip=1 -C .gitlab/docker/sdk - -test Docker image sdk-ipq40xx-generic: - extends: .test Docker SDK image - needs: ["build Docker image sdk-ipq40xx-generic"] - -deploy Docker image sdk-ipq40xx-generic: - stage: docker SDK deploy - extends: .deploy Docker image - needs: ["test Docker image sdk-ipq40xx-generic"] - - build Docker image sdk-mvebu-cortexa9: stage: docker SDK needs: ["build test mvebu prpl webui"]