diff --git a/ci/.gitignore b/ci/.gitignore index 0a846c2a..63b7e11f 100644 --- a/ci/.gitignore +++ b/ci/.gitignore @@ -1,2 +1 @@ vars.yml -source.me diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 2d884e00..8b5e6806 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -9,6 +9,7 @@ groups: - acceptance-tests - acceptance-tests-pr - autobump-dependencies + - build-pcap-testflight-image jobs: - name: unit-tests @@ -18,16 +19,11 @@ jobs: - do: - get: git trigger: true + - get: pcap-release-testflight - task: lint + image: pcap-release-testflight config: platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) inputs: - { name: git } caches: @@ -39,18 +35,11 @@ jobs: params: REPO_ROOT: git - task: unit-tests + image: pcap-release-testflight config: platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) inputs: - { name: git } - caches: - path: git/vendor/cache - path: git/.bundle @@ -73,21 +62,16 @@ jobs: plan: - do: - { get: git-pull-requests, trigger: true, version: every } + - get: pcap-release-testflight - put: git-pull-requests params: path: git-pull-requests status: pending context: unit-tests - task: lint + image: pcap-release-testflight config: platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) inputs: - { name: git-pull-requests } caches: @@ -99,15 +83,9 @@ jobs: params: REPO_ROOT: git-pull-requests - task: unit-tests + image: pcap-release-testflight config: platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) inputs: - { name: git-pull-requests } caches: @@ -139,17 +117,12 @@ jobs: - in_parallel: - { get: git, trigger: true, passed: [ unit-tests ] } - { get: stemcell } + - get: pcap-release-testflight - task: acceptance-tests privileged: true + image: pcap-release-testflight config: platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) inputs: - { name: git } - { name: stemcell } @@ -173,6 +146,7 @@ jobs: - do: - { get: git-pull-requests, trigger: true, version: every } - { get: stemcell } + - get: pcap-release-testflight - put: git-pull-requests params: path: git-pull-requests @@ -180,15 +154,9 @@ jobs: context: acceptance-tests - task: acceptance-tests privileged: true + image: pcap-release-testflight config: platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) inputs: - { name: git-pull-requests } - { name: stemcell } @@ -217,16 +185,11 @@ jobs: - do: - in_parallel: - { get: git, passed: [rc] } + - get: pcap-release-testflight - task: release + image: pcap-release-testflight config: platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) inputs: - name: git outputs: @@ -242,7 +205,6 @@ jobs: GITHUB_OWNER: cloudfoundry GITHUB_TOKEN: ((github.access_token)) GCP_SERVICE_KEY: ((gcp.service_key)) - - put: blobstore params: file: "gh/artifacts/pcap-*.tgz" @@ -252,7 +214,7 @@ jobs: channel: "#pcap-release" username: ci-bot icon_url: "((slack.icon))" - text: "((slack.fail_url)) pcap-boshrelease : shipit job failed" + text: "((slack.fail_url)) pcap-boshrelease : shipit job failed" - name: rc public: true @@ -261,16 +223,11 @@ jobs: - do: - in_parallel: - { get: git, passed: [acceptance-tests] } + - get: pcap-release-testflight - task: release-candidate + image: pcap-release-testflight config: platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) inputs: - name: git outputs: @@ -287,6 +244,7 @@ jobs: GITHUB_OWNER: cloudfoundry GITHUB_TOKEN: ((github.access_token)) GCP_SERVICE_KEY: ((gcp.service_key)) + - name: autobump-dependencies public: true serial: true @@ -296,20 +254,15 @@ jobs: trigger: true - get: git - get: golang-release + - get: pcap-release-testflight - in_parallel: steps: - task: autobump-dependencies + image: pcap-release-testflight config: inputs: - name: git platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) run: dir: git path: /usr/bin/python3 @@ -319,22 +272,15 @@ jobs: PR_BASE: main PR_ORG: cloudfoundry PR_LABEL: run-ci - GCP_SERVICE_KEY: ((gcp.service_key)) GITHUB_COM_TOKEN: ((github.access_token)) - task: autobump-golang-release + image: pcap-release-testflight config: inputs: - name: git - name: golang-release platform: linux - image_resource: - type: docker-image - source: - repository: cf-routing.common.repositories.cloud.sap/pcap-release-testflight - tag: latest - username: ((docker.username)) - password: ((docker.password)) run: dir: git path: /usr/bin/python3 @@ -347,10 +293,39 @@ jobs: PR_LABEL: run-ci GIT_AUTHOR_NAME: ((github.bot_user)) GIT_AUTHOR_EMAIL: ((github.bot_email)) - GCP_SERVICE_KEY: ((gcp.service_key)) GITHUB_COM_TOKEN: ((github.access_token)) + - name: build-pcap-testflight-image + public: true + serial: true + plan: + - in_parallel: + - get: git-ci + trigger: true + - get: daily + trigger: true + - get: docker-cpi-image + trigger: true + - task: create-daily-tag + image: docker-cpi-image + config: + outputs: + - name: tag + platform: linux + run: + path: sh + args: + - -exc + - date +%Y.%m.%d-%H%M%S | tee tag/today + - put: pcap-release-testflight + params: + tag_as_latest: true + tag_file: tag/today + build: git-ci/ci + get_params: + skip_download: true + resource_types: - name: slack-notification type: docker-image @@ -422,3 +397,24 @@ resources: stop: 8:00 AM location: Europe/Berlin interval: 24h + + - name: git-ci + type: git + source: + uri: https://github.com/cloudfoundry/pcap-release.git + branch: main + paths: + - ci/Dockerfile + - ci/scripts/requirements.txt + + - name: docker-cpi-image + type: docker-image + source: + repository: bosh/docker-cpi + + - name: pcap-release-testflight + type: docker-image + source: + repository: europe-west3-docker.pkg.dev/app-runtime-platform-wg/arp-wg-docker/pcap-release-testflight + username: _json_key + password: ((gcp.docker_image_writer_service_key)) diff --git a/ci/upload-to-concourse.sh b/ci/upload-to-concourse.sh index 39c84011..6062f06a 100755 --- a/ci/upload-to-concourse.sh +++ b/ci/upload-to-concourse.sh @@ -9,7 +9,8 @@ fi echo "Please follow https://github.com/cloudfoundry/routing-concourse/blob/main/README.md#authentication-to-concourse for login." -fly -t networking-extensions login -c https://concourse.arp.cloudfoundry.org/ +! fly status -t networking-extensions >/dev/null && \ + fly -t networking-extensions login -c https://concourse.arp.cloudfoundry.org/ fly -t networking-extensions validate-pipeline -c pipeline.yml fly -t networking-extensions set-pipeline -p pcap-release -c pipeline.yml --load-vars-from vars.yml fly -t networking-extensions expose-pipeline -p pcap-release