From b77968b26e2ef902bea1bc74f63a5b1ea0734a6b Mon Sep 17 00:00:00 2001 From: Chris McClimans Date: Fri, 26 May 2017 04:57:00 +1200 Subject: [PATCH 01/15] add .gitlab-ci.yml to master --- .gitlab-ci.yml | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000000..b9a59939447 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,71 @@ +stages: + - build + - package + - release + +before_script: + - export CI_COMMIT_SHA_SHORT=$(echo ${CI_COMMIT_SHA} | cut -c -8) + +compile: + image: golang:1.8.1 + stage: build + script: + - echo $GOPATH + - ln -s /builds /go/src/github.com + - cd /go/src/github.com/coredns/coredns + - make -j $(getconf _NPROCESSORS_ONLN) + -f Makefile.release build + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" + untracked: true + expire_in: 4 weeks + paths: + - build/ + +tar: + stage: package + image: golang:1.8.1 + script: + - make -f Makefile.release tar + dependencies: + - compile + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" + untracked: true + expire_in: 4 weeks + paths: + - release/ + +container: + stage: package + image: docker:17.05.0 + script: + - IMAGE_TAG=${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA_SHORT}.${CI_JOB_ID} + - cp build/Linux/coredns . + - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY + - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . + - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" + - echo image.repository=$CI_REGISTRY_IMAGE | tee release.properties + - echo image.tag=$IMAGE_TAG | tee -a release.properties + dependencies: + - compile + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" + expire_in: 4 weeks + paths: + - release.properties + +release: + stage: release + image: golang:1.8.1 + script: + - echo combining pipeline artifacts into a release + dependencies: + - container + - tar + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" + expire_in: 4 weeks + paths: + - release.properties + - release/ From b4419fda91ca752dcecea59dd9fc6032550a9b49 Mon Sep 17 00:00:00 2001 From: Chris McClimans Date: Tue, 6 Jun 2017 05:59:09 +1200 Subject: [PATCH 02/15] release.env and build e2e --- .gitlab-ci.yml | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9a59939447..32aafde9d31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ stages: - build - package - release + - build-e2e before_script: - export CI_COMMIT_SHA_SHORT=$(echo ${CI_COMMIT_SHA} | cut -c -8) @@ -21,6 +22,16 @@ compile: expire_in: 4 weeks paths: - build/ + +build-e2e: + stage: build + variables: + COREDNS_DOCKER_REGISTRY: "${CI_REGISTRY_IMAGE}" + COREDNS_DOCKER_IMAGE_TAG: "${CI_COMMIT_REF_SLUG}.job.${CI_JOB_ID}" + script: + - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY + - docker build -t "$CI_REGISTRY_IMAGE/coredns-e2e:$COREDNS_DOCKER_IMAGE_TAG" ./e2e/ + - docker push "$CI_REGISTRY_IMAGE/coredns-e2e:$COREDNS_DOCKER_IMAGE_TAG" tar: stage: package @@ -35,6 +46,9 @@ tar: expire_in: 4 weeks paths: - release/ + + + container: stage: package @@ -45,21 +59,22 @@ container: - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" - - echo image.repository=$CI_REGISTRY_IMAGE | tee release.properties - - echo image.tag=$IMAGE_TAG | tee -a release.properties + - echo export COREDNS_IMAGE=$CI_REGISTRY_IMAGE | tee release.env + - echo export COREDNS_TAG=$IMAGE_TAG | tee -a release.env + - cat release.env dependencies: - compile artifacts: name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" expire_in: 4 weeks paths: - - release.properties + - release.env release: stage: release image: golang:1.8.1 script: - - echo combining pipeline artifacts into a release + - cat release.env dependencies: - container - tar @@ -67,5 +82,5 @@ release: name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" expire_in: 4 weeks paths: - - release.properties + - release.env - release/ From 985c2908409eba2c0e4510956646641ad47964e6 Mon Sep 17 00:00:00 2001 From: Chris McClimans Date: Tue, 6 Jun 2017 06:00:47 +1200 Subject: [PATCH 03/15] add e2e to ci-master --- e2e/Dockerfile | 21 +++++ e2e/files/test.yml | 198 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) create mode 100644 e2e/Dockerfile create mode 100644 e2e/files/test.yml diff --git a/e2e/Dockerfile b/e2e/Dockerfile new file mode 100644 index 00000000000..ef903074404 --- /dev/null +++ b/e2e/Dockerfile @@ -0,0 +1,21 @@ +FROM golang:alpine +MAINTAINER "Denver Williams " +ENV KUBECTL_VERSION=v1.5.2 +ENV ARC=amd64 + +# Install Deps +RUN apk update +RUN apk add --update git bash util-linux wget tar curl build-base +RUN go get -u github.com/coredns/coredns/test + +#Install Kubectl +RUN wget -O /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/$ARC/kubectl && \ +chmod +x /usr/local/bin/kubectl + +#Copy Files + +COPY files/ /coredns/e2e/ + +WORKDIR /go/src/github.com/coredns/coredns/test + +CMD ["/bin/bash"] diff --git a/e2e/files/test.yml b/e2e/files/test.yml new file mode 100644 index 00000000000..6dca894da20 --- /dev/null +++ b/e2e/files/test.yml @@ -0,0 +1,198 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: test-1 +--- +apiVersion: v1 +kind: Namespace +metadata: + name: test-2 +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: de-1-a + namespace: test-1 +spec: + replicas: 1 + template: + metadata: + labels: + app: app-1-a + spec: + containers: + - name: app-1-a-c + image: gcr.io/google_containers/pause-amd64:3.0 + ports: + - containerPort: 80 + name: http + protocol: TCP + - containerPort: 443 + name: https + protocol: TCP +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: de-1-b + namespace: test-1 +spec: + replicas: 1 + template: + metadata: + labels: + app: app-1-b + spec: + containers: + - name: app-1-b-c + image: gcr.io/google_containers/pause-amd64:3.0 + ports: + - containerPort: 80 + name: http + protocol: TCP +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: de-c + namespace: test-1 +spec: + replicas: 1 + template: + metadata: + labels: + app: app-c + spec: + containers: + - name: app-c-c + image: gcr.io/google_containers/pause-amd64:3.0 + ports: + - containerPort: 1234 + name: c-port + protocol: UDP +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: de-c + namespace: test-2 +spec: + replicas: 1 + template: + metadata: + labels: + app: app-c + spec: + containers: + - name: app-c-c + image: gcr.io/google_containers/pause-amd64:3.0 + ports: + - containerPort: 1234 + name: c-port + protocol: UDP +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: de-d1 + namespace: test-1 +spec: + replicas: 2 + template: + metadata: + labels: + app: app-d + spec: + containers: + - name: app-d-c + image: gcr.io/google_containers/pause-amd64:3.0 + ports: + - containerPort: 1234 + name: c-port + protocol: UDP +--- +apiVersion: v1 +kind: Service +metadata: + name: svc-1-a + namespace: test-1 +spec: + selector: + app: app-1-a + clusterIP: 10.0.0.100 + ports: + - name: http + port: 80 + protocol: TCP + - name: https + port: 443 + protocol: TCP +--- +apiVersion: v1 +kind: Service +metadata: + name: svc-1-b + namespace: test-1 +spec: + selector: + app: app-1-b + clusterIP: 10.0.0.110 + ports: + - name: http + port: 80 + protocol: TCP +--- +apiVersion: v1 +kind: Service +metadata: + name: svc-c + namespace: test-1 +spec: + selector: + app: app-c + clusterIP: 10.0.0.115 + ports: + - name: c-port + port: 1234 + protocol: UDP +--- +apiVersion: v1 +kind: Service +metadata: + name: svc-c + namespace: test-2 +spec: + selector: + app: app-c + clusterIP: 10.0.0.120 + ports: + - name: c-port + port: 1234 + protocol: UDP +--- +apiVersion: v1 +kind: Service +metadata: + name: headless-svc + namespace: test-1 +spec: + selector: + app: app-d + clusterIP: None + ports: + - name: c-port + port: 1234 + protocol: UDP +--- +apiVersion: v1 +kind: Service +metadata: + name: ext-svc + namespace: test-1 +spec: + type: ExternalName + externalName: example.net + ports: + - name: c-port + port: 1234 + protocol: UDP From 5a78d8629fb9aed410821fa392108ab1482126a9 Mon Sep 17 00:00:00 2001 From: Hippie Hacker Date: Wed, 7 Jun 2017 21:57:49 +0000 Subject: [PATCH 04/15] Testing mirror from gitlab.cncf.ci to gitlab.com/ii/* --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32aafde9d31..cb2a0837b34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,8 +46,6 @@ tar: expire_in: 4 weeks paths: - release/ - - container: From ee2f4d07e78f27ed7d922dd3714e01383cf5bb67 Mon Sep 17 00:00:00 2001 From: Chris McClimans Date: Fri, 23 Jun 2017 12:22:54 -0500 Subject: [PATCH 05/15] Bring in changes from stable --- .gitlab-ci.yml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb2a0837b34..81f6b5aca6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ stages: - build - package - release - - build-e2e before_script: - export CI_COMMIT_SHA_SHORT=$(echo ${CI_COMMIT_SHA} | cut -c -8) @@ -14,8 +13,9 @@ compile: - echo $GOPATH - ln -s /builds /go/src/github.com - cd /go/src/github.com/coredns/coredns + - go get github.com/mholt/caddy - make -j $(getconf _NPROCESSORS_ONLN) - -f Makefile.release build + -f Makefile.release build-linux artifacts: name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" untracked: true @@ -23,17 +23,7 @@ compile: paths: - build/ -build-e2e: - stage: build - variables: - COREDNS_DOCKER_REGISTRY: "${CI_REGISTRY_IMAGE}" - COREDNS_DOCKER_IMAGE_TAG: "${CI_COMMIT_REF_SLUG}.job.${CI_JOB_ID}" - script: - - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY - - docker build -t "$CI_REGISTRY_IMAGE/coredns-e2e:$COREDNS_DOCKER_IMAGE_TAG" ./e2e/ - - docker push "$CI_REGISTRY_IMAGE/coredns-e2e:$COREDNS_DOCKER_IMAGE_TAG" - -tar: +.tar: stage: package image: golang:1.8.1 script: @@ -47,7 +37,6 @@ tar: paths: - release/ - container: stage: package image: docker:17.05.0 @@ -73,12 +62,15 @@ release: image: golang:1.8.1 script: - cat release.env + - curl -X POST + -F token=$CI_JOB_TOKEN + -F ref=ci-master + https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline + - echo FIXME -- vars not support with CI_JOB_TOKEN yet -F "variables[COREDNS_BRANCH]=${CI_COMMIT_REF_NAME}" dependencies: - container - - tar artifacts: name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" expire_in: 4 weeks paths: - release.env - - release/ From 9c39788f4ff43816f9b39ef260ee84d50d75f0dc Mon Sep 17 00:00:00 2001 From: Hippie Hacker Date: Tue, 11 Jul 2017 19:21:41 +0000 Subject: [PATCH 06/15] Trigger cross-cloud ci-master-v0.1.0 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81f6b5aca6a..ef427ab12ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ release: - cat release.env - curl -X POST -F token=$CI_JOB_TOKEN - -F ref=ci-master + -F ref=ci-master-v0.1.0 https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline - echo FIXME -- vars not support with CI_JOB_TOKEN yet -F "variables[COREDNS_BRANCH]=${CI_COMMIT_REF_NAME}" dependencies: From 5348c703ef01c60ec589af1140cd3ef9a7419290 Mon Sep 17 00:00:00 2001 From: dlx Date: Mon, 31 Jul 2017 22:03:46 +0000 Subject: [PATCH 07/15] Test Trigger --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef427ab12ec..d614f15a5b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,10 +62,10 @@ release: image: golang:1.8.1 script: - cat release.env - - curl -X POST - -F token=$CI_JOB_TOKEN - -F ref=ci-master-v0.1.0 - https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline + #- curl -X POST + # -F token=$CI_JOB_TOKEN + # -F ref=ci-master-v0.1.0 + # https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline - echo FIXME -- vars not support with CI_JOB_TOKEN yet -F "variables[COREDNS_BRANCH]=${CI_COMMIT_REF_NAME}" dependencies: - container From 2215d62af6db185d698defe99ea740783ba83a68 Mon Sep 17 00:00:00 2001 From: dlx Date: Mon, 31 Jul 2017 22:11:46 +0000 Subject: [PATCH 08/15] Update .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d614f15a5b9..ef427ab12ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,10 +62,10 @@ release: image: golang:1.8.1 script: - cat release.env - #- curl -X POST - # -F token=$CI_JOB_TOKEN - # -F ref=ci-master-v0.1.0 - # https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline + - curl -X POST + -F token=$CI_JOB_TOKEN + -F ref=ci-master-v0.1.0 + https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline - echo FIXME -- vars not support with CI_JOB_TOKEN yet -F "variables[COREDNS_BRANCH]=${CI_COMMIT_REF_NAME}" dependencies: - container From d7352a3e748b5ec352e44282a5a3e8c2384ad5ce Mon Sep 17 00:00:00 2001 From: dlx Date: Mon, 31 Jul 2017 22:26:23 +0000 Subject: [PATCH 09/15] Test Trigger VARs --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef427ab12ec..b80a460d0c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,6 +65,7 @@ release: - curl -X POST -F token=$CI_JOB_TOKEN -F ref=ci-master-v0.1.0 + -F "variables[UPLOAD_TO_S3]=true" https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline - echo FIXME -- vars not support with CI_JOB_TOKEN yet -F "variables[COREDNS_BRANCH]=${CI_COMMIT_REF_NAME}" dependencies: From 1162ea8b5f0652a5b2fce942b5e541c1017d2442 Mon Sep 17 00:00:00 2001 From: dlx Date: Mon, 31 Jul 2017 22:31:42 +0000 Subject: [PATCH 10/15] Update Trigger Command --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b80a460d0c1..8689164c777 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,10 +62,10 @@ release: image: golang:1.8.1 script: - cat release.env - - curl -X POST - -F token=$CI_JOB_TOKEN - -F ref=ci-master-v0.1.0 - -F "variables[UPLOAD_TO_S3]=true" + - curl --request POST \ + --form token=$CI_JOB_TOKEN \ + --form ref=ci-master-v0.1.0 \ + --form "variables[UPLOAD_TO_S3]=true" \ https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline - echo FIXME -- vars not support with CI_JOB_TOKEN yet -F "variables[COREDNS_BRANCH]=${CI_COMMIT_REF_NAME}" dependencies: From 099df445ca965c3804fbc045ebba3a0b81968c66 Mon Sep 17 00:00:00 2001 From: dlx Date: Mon, 31 Jul 2017 23:33:47 +0000 Subject: [PATCH 11/15] Update .gitlab-ci.yml --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8689164c777..ee0cc63c4ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,10 +62,9 @@ release: image: golang:1.8.1 script: - cat release.env - - curl --request POST \ - --form token=$CI_JOB_TOKEN \ - --form ref=ci-master-v0.1.0 \ - --form "variables[UPLOAD_TO_S3]=true" \ + - curl -X POST + -F token=$CI_JOB_TOKEN + -F ref=ci-master-v0.1.0 https://gitlab.cncf.ci/api/v4/projects/2/trigger/pipeline - echo FIXME -- vars not support with CI_JOB_TOKEN yet -F "variables[COREDNS_BRANCH]=${CI_COMMIT_REF_NAME}" dependencies: From 989d04d970746fd92bc1b5c9994d26e4b974151f Mon Sep 17 00:00:00 2001 From: wolfpack Date: Thu, 16 Nov 2017 14:46:52 -0500 Subject: [PATCH 12/15] dashboard update call added for master branch --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee0cc63c4ae..70cb88235f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,23 @@ stages: before_script: - export CI_COMMIT_SHA_SHORT=$(echo ${CI_COMMIT_SHA} | cut -c -8) + - echo "Starting job ${CI_JOB_NAME}" + - export PIPELINE_RELEASE_TYPE="head" # or "stable" + #- curl -qsL https://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard -o update_dashboard || true + - rm -f update_dashboard + - wget -nv http://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard || apk update && apk add bash curl && curl -o update_dashboard http://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard + - cat update_dashboard + - chmod +x update_dashboard + - bash ./update_dashboard + +after_script: + - echo "Ending job ${CI_JOB_NAME}" + - export PIPELINE_RELEASE_TYPE="head" # or "stable" + #- curl -qsL https://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard -o update_dashboard || true + - rm -f update_dashboard + - wget -nv http://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard || apk update && apk add bash curl && curl -o update_dashboard http://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard + - chmod +x update_dashboard + - bash ./update_dashboard compile: image: golang:1.8.1 From bd30cc3bf5eafab116aef2c9fd8e3f704c1e088b Mon Sep 17 00:00:00 2001 From: denverwilliams Date: Thu, 16 Nov 2017 23:37:14 +0000 Subject: [PATCH 13/15] Use Default Image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70cb88235f6..29ff9854d18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ compile: container: stage: package - image: docker:17.05.0 + #image: docker:17.05.0 script: - IMAGE_TAG=${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA_SHORT}.${CI_JOB_ID} - cp build/Linux/coredns . From 146f0c85ee9ff33f75a885c30f8f140a2e4a501e Mon Sep 17 00:00:00 2001 From: wolfpack Date: Fri, 17 Nov 2017 00:12:10 -0500 Subject: [PATCH 14/15] moved branch ref check to dashboard update client --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29ff9854d18..911fe8bef2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,11 +3,14 @@ stages: - package - release +variables: + DASHBOARD_STABLE_REF_NAME: "ci-v008" + DASHBOARD_MASTER_REF_NAME: "ci-master" + DASHBOARD_HEAD_REF_NAME: "$MASTER_REF_NAME" + before_script: - export CI_COMMIT_SHA_SHORT=$(echo ${CI_COMMIT_SHA} | cut -c -8) - echo "Starting job ${CI_JOB_NAME}" - - export PIPELINE_RELEASE_TYPE="head" # or "stable" - #- curl -qsL https://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard -o update_dashboard || true - rm -f update_dashboard - wget -nv http://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard || apk update && apk add bash curl && curl -o update_dashboard http://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard - cat update_dashboard @@ -16,8 +19,6 @@ before_script: after_script: - echo "Ending job ${CI_JOB_NAME}" - - export PIPELINE_RELEASE_TYPE="head" # or "stable" - #- curl -qsL https://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard -o update_dashboard || true - rm -f update_dashboard - wget -nv http://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard || apk update && apk add bash curl && curl -o update_dashboard http://gitlab.dev.cncf.ci/cncf/cross-cloud/raw/ci-stable-v0.1.0/update_dashboard - chmod +x update_dashboard From 2be3daafed6227c8038fda566b1bd5b60cda1547 Mon Sep 17 00:00:00 2001 From: wolfpack Date: Fri, 17 Nov 2017 01:07:11 -0500 Subject: [PATCH 15/15] master head var update --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 911fe8bef2f..9ad0243c9f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: variables: DASHBOARD_STABLE_REF_NAME: "ci-v008" DASHBOARD_MASTER_REF_NAME: "ci-master" - DASHBOARD_HEAD_REF_NAME: "$MASTER_REF_NAME" + DASHBOARD_HEAD_REF_NAME: "$DASHBOARD_MASTER_REF_NAME" before_script: - export CI_COMMIT_SHA_SHORT=$(echo ${CI_COMMIT_SHA} | cut -c -8)