diff --git a/ci/Jenkinsfile.release b/ci/Jenkinsfile.release index 48a3ff036..ed21203b4 100644 --- a/ci/Jenkinsfile.release +++ b/ci/Jenkinsfile.release @@ -23,7 +23,7 @@ pipeline { string( name: 'IMAGE_TAG', description: 'Name of Docker tag to push. Optional Parameter.', - defaultValue: params.IMAGE_TAG ?: 'deploy-v2-test', + defaultValue: params.IMAGE_TAG ?: 'deploy-wakuv2-test', ) string( name: 'IMAGE_NAME', diff --git a/docs/contributors/continuous-integration.md b/docs/contributors/continuous-integration.md index 6b1b03e11..b54c03ed7 100644 --- a/docs/contributors/continuous-integration.md +++ b/docs/contributors/continuous-integration.md @@ -11,9 +11,9 @@ https://ci.status.im/job/nim-waku/ It currently consists four jobs: * [manual](https://ci.status.im/job/nim-waku/job/manual/) - For manually executing builds using parameters. -* [deploy-v1-test](https://ci.status.im/job/nim-waku/job/deploy-v1-test/) - Builds every new commit in `master` and deploys to `wakuv1.test` fleet. -* [deploy-v2-test](https://ci.status.im/job/nim-waku/job/deploy-v2-test/) - Builds every new commit in `master` and deploys to `wakuv2.test` fleet. -* [deploy-v2-prod](https://ci.status.im/job/nim-waku/job/deploy-v2-prod/) - Currently has no automatic trigger, and deploys to `wakuv2.prod` fleet. +* [deploy-wakuv1-test](https://ci.status.im/job/nim-waku/job/deploy-wakuv1-test/) - Builds every new commit in `master` and deploys to `wakuv1.test` fleet. +* [deploy-wakuv2-test](https://ci.status.im/job/nim-waku/job/deploy-wakuv2-test/) - Builds every new commit in `master` and deploys to `wakuv2.test` fleet. +* [deploy-wakuv2-prod](https://ci.status.im/job/nim-waku/job/deploy-wakuv2-prod/) - Currently has no automatic trigger, and deploys to `wakuv2.prod` fleet. # Configuration @@ -28,5 +28,5 @@ Key part is the definition of four `parameters`: The use of `?:` [Elvis operator](http://groovy-lang.org/operators.html#_elvis_operator) plays a key role in allowing parameters to be changed for each defined job in Jenkins without it being overridden by the `Jenkinsfile` defaults after every job run. ```groovy -defaultValue: params.IMAGE_TAG ?: 'deploy-v2-test', +defaultValue: params.IMAGE_TAG ?: 'deploy-wakuv2-test', ``` diff --git a/docs/contributors/release-process.md b/docs/contributors/release-process.md index f6c63a921..db2b7bc60 100644 --- a/docs/contributors/release-process.md +++ b/docs/contributors/release-process.md @@ -62,7 +62,7 @@ git push origin v0.1 > Clients are reachable via the corresponding channels on the Vac Discord server. > It should be enough to inform clients on the `#nwaku` and `#announce` channels on Discord. > Informal conversations with specific repo maintainers are often part of this process. - - Deploy release to the `wakuv2.prod` fleet from [Jenkins](https://ci.status.im/job/nim-waku/job/deploy-v2-prod/). + - Deploy release to the `wakuv2.prod` fleet from [Jenkins](https://ci.status.im/job/nim-waku/job/deploy-wakuv2-prod/). - Ensure that nodes successfully start up and monitor health using [Grafana](https://grafana.infra.status.im/d/qrp_ZCTGz/nim-waku-v2?orgId=1) and [Kibana](https://kibana.infra.status.im/goto/a7728e70-eb26-11ec-81d1-210eb3022c76). - If necessary, revert by deploying the previous release. Download logs and open a bug report issue. -3. Deploy release image to [Dockerhub](https://hub.docker.com/layers/statusteam/nim-waku/a5f8b9/images/sha256-88691a8f82bd6a4242fa99053a65b7fc4762b23a2b4e879d0f8b578c798a0e09?context=explore) by triggering [the same Jenkins job](https://ci.status.im/job/nim-waku/job/deploy-v2-prod/) as before, but with the `IMAGE_TAG` set to the release tag (e.g. `v0.10`). +3. Deploy release image to [Dockerhub](https://hub.docker.com/layers/statusteam/nim-waku/a5f8b9/images/sha256-88691a8f82bd6a4242fa99053a65b7fc4762b23a2b4e879d0f8b578c798a0e09?context=explore) by triggering [the same Jenkins job](https://ci.status.im/job/nim-waku/job/deploy-wakuv2-prod/) as before, but with the `IMAGE_TAG` set to the release tag (e.g. `v0.10`). diff --git a/docs/contributors/waku-fleets.md b/docs/contributors/waku-fleets.md index ad6dc5c61..b574021e2 100644 --- a/docs/contributors/waku-fleets.md +++ b/docs/contributors/waku-fleets.md @@ -80,8 +80,8 @@ Please report any broken panels via our Discord channels or by [creating an issu ### 4. [Jenkins](https://ci.status.im/job/nim-waku/) for deployment The [`nim-waku` jobs](https://ci.status.im/job/nim-waku/) on Jenkins are configured to deploy `nim-waku` builds to the fleets. -1. [`deploy-v2-test`](https://ci.status.im/job/nim-waku/job/deploy-v2-test/) is triggered automatically after every commit to the `nim-waku` `master` branch. -2. [`deploy-v2-prod`](https://ci.status.im/job/nim-waku/job/deploy-v2-prod/) must be triggered manually. Usually this job is only built after a tagged release in `nim-waku`. +1. [`deploy-wakuv2-test`](https://ci.status.im/job/nim-waku/job/deploy-wakuv2-test/) is triggered automatically after every commit to the `nim-waku` `master` branch. +2. [`deploy-wakuv2-prod`](https://ci.status.im/job/nim-waku/job/deploy-wakuv2-prod/) must be triggered manually. Usually this job is only built after a tagged release in `nim-waku`. Each job can be manually triggered using the _"Build with Parameters"_ option. Options under _"Configure"_ include the build triggers, build target and branches to build. @@ -99,8 +99,8 @@ See [Continuous Integration docs](https://github.com/status-im/nim-waku/blob/mas 6. [`infra-docs` repo](https://github.com/status-im/infra-docs) 7. [`infra-nim-waku` repo](https://github.com/status-im/infra-nim-waku) 8. [Jenkins jobs for `nim-waku`](https://ci.status.im/job/nim-waku/) - 9. [Jenkins deploy-v2-prod manual trigger](https://ci.status.im/job/nim-waku/job/deploy-v2-prod/build) - 10. [Jenkins deploy-v2-test manual trigger](https://ci.status.im/job/nim-waku/job/deploy-v2-test/build) + 9. [Jenkins deploy-wakuv2-prod manual trigger](https://ci.status.im/job/nim-waku/job/deploy-wakuv2-prod/build) + 10. [Jenkins deploy-wakuv2-test manual trigger](https://ci.status.im/job/nim-waku/job/deploy-wakuv2-test/build) 11. [Kibana logs for `prod`](https://kibana.infra.status.im/goto/87fde8e4bba7246ce3780a0c8344f4f0) 12. [Kibana logs for `test`](https://kibana.infra.status.im/goto/fc23759670fd08e9d32e81bb4e58733d) 13. [Status fleets](https://fleets.status.im/)