diff options
| -rw-r--r-- | .gitlab-ci.d/buildtest.yml | 1 | ||||
| -rw-r--r-- | .gitlab-ci.d/container-template.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci.d/default.yml | 3 | ||||
| -rw-r--r-- | .gitlab-ci.d/opensbi.yml | 8 | ||||
| -rw-r--r-- | .gitlab-ci.d/qemu-project.yml | 17 |
5 files changed, 8 insertions, 27 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 35600b470b..307cba1aab 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -98,7 +98,6 @@ crash-test-debian: needs: - job: build-system-debian artifacts: true - timeout: 90m variables: IMAGE: debian-amd64 script: diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index f55a954741..519b8a9482 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -1,14 +1,14 @@ .container_job_template: extends: .base_job_template - image: docker:20.10.16 + image: docker:stable stage: containers services: - - docker:20.10.16-dind + - docker:dind before_script: - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - apk add python3 - - until docker info; do sleep 1; done + - docker info - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - echo "TAG:$TAG" diff --git a/.gitlab-ci.d/default.yml b/.gitlab-ci.d/default.yml deleted file mode 100644 index 292be8b91c..0000000000 --- a/.gitlab-ci.d/default.yml +++ /dev/null @@ -1,3 +0,0 @@ -default: - tags: - - $RUNNER_TAG diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 5b0b47b57b..9a651465d8 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -42,15 +42,17 @@ docker-opensbi: extends: .opensbi_job_rules stage: containers - image: docker:20.10.16 + image: docker:stable services: - - docker:20.10.16-dind + - docker:stable-dind variables: GIT_DEPTH: 3 IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build + # We don't use TLS + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" before_script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - until docker info; do sleep 1; done script: - docker pull $IMAGE_TAG || true - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml index 57b175f5c2..a7ed447fe4 100644 --- a/.gitlab-ci.d/qemu-project.yml +++ b/.gitlab-ci.d/qemu-project.yml @@ -1,24 +1,7 @@ # This file contains the set of jobs run by the QEMU project: # https://gitlab.com/qemu-project/qemu/-/pipelines -variables: - RUNNER_TAG: "" - -workflow: - rules: - # Set additional variables when running on Kubernetes. - # https://wiki.qemu.org/Testing/CI/KubernetesRunners - - if: $RUNNER_TAG == "k8s" - variables: - DOCKER_HOST: tcp://docker:2376 - DOCKER_TLS_CERTDIR: "/certs" - DOCKER_TLS_VERIFY: 1 - DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client" - # Run the pipeline in other cases. - - when: always - include: - - local: '/.gitlab-ci.d/default.yml' - local: '/.gitlab-ci.d/base.yml' - local: '/.gitlab-ci.d/stages.yml' - local: '/.gitlab-ci.d/opensbi.yml' |