Initial move of integration-tests/deployment to /deployment as a sepa…

…rate module.

This updates the dependencies, and makes the integration-tests depend on both chainlink and the deployments package.

A few things to fix.  The go.mod entry for deployments is off, because there is no version currently checked-in. It's overridden in a replace statement, but I'm not sure if there are any contexts in which that goes wrong. It just seems weird to keep an incorrect version number there.

.changeset/hot-mice-yell.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Relocation of the deployment directory into a direct subdir of the root. #internal

.github/CODEOWNERS

@@ -129,9 +129,9 @@ core/scripts/gateway @smartcontractkit/dev-services
 
 # Deployment tooling
 # Initially the common structures owned by CCIP
-/integration-tests/deployment @smartcontractkit/ccip @smartcontractkit/keystone
-/integration-tests/deployment/ccip @smartcontractkit/ccip
-/integration-tests/deployment/keystone @smartcontractkit/keystone
+/deployment @smartcontractkit/ccip @smartcontractkit/keystone
+/deployment/ccip @smartcontractkit/ccip
+/deployment/keystone @smartcontractkit/keystone
 # TODO: As more products add their deployment logic here, add the team as an owner
 
 # CI/CD

.github/workflows/ci-core.yml

@@ -46,9 +46,8 @@ jobs:
         with:
           filters: |
             changes:
-              - 'integration-tests/deployment/**'
+              - 'deployment/**'
               - '!integration-tests/**'
-              - 'integration-tests/deployment/**'
       - name: Ignore Filter On Workflow Dispatch
         if: ${{ github.event_name == 'workflow_dispatch' }}
         id: ignore-filter

core/scripts/go.mod

@@ -5,7 +5,7 @@ go 1.22.8
 // Make sure we're working with the latest chainlink libs
 replace github.com/smartcontractkit/chainlink/v2 => ../../
 
-replace github.com/smartcontractkit/chainlink/integration-tests => ../../integration-tests
+replace github.com/smartcontractkit/chainlink/deployment => ../../deployment
 
 require (
 	github.com/docker/docker v27.3.1+incompatible
@@ -25,8 +25,8 @@ require (
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chainlink-automation v0.8.0
 	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241021103500-39a6e78c0286
-	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-00010101000000-000000000000
-	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
+	github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000
+	github.com/smartcontractkit/chainlink/v2 v2.17.0
 	github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0

core/scripts/keystone/src/01_deploy_contracts_cmd.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 
 	helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
-	ksdeploy "github.com/smartcontractkit/chainlink/integration-tests/deployment/keystone"
+	ksdeploy "github.com/smartcontractkit/chainlink/deployment/keystone"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/ocr3_capability"
 )

core/scripts/keystone/src/88_gen_jobspecs.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
-	ksdeploy "github.com/smartcontractkit/chainlink/integration-tests/deployment/keystone"
+	ksdeploy "github.com/smartcontractkit/chainlink/deployment/keystone"
 )
 
 type spec []string

core/scripts/keystone/src/88_gen_ocr3_config.go

@@ -2,7 +2,7 @@ package src
 
 import (
 	helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
-	ksdeploy "github.com/smartcontractkit/chainlink/integration-tests/deployment/keystone"
+	ksdeploy "github.com/smartcontractkit/chainlink/deployment/keystone"
 )
 
 func mustReadConfig(fileName string) (output ksdeploy.TopLevelConfigSource) {

core/scripts/keystone/src/99_fetch_keys.go

@@ -13,7 +13,7 @@ import (
 	"github.com/urfave/cli"
 
 	helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
-	ksdeploy "github.com/smartcontractkit/chainlink/integration-tests/deployment/keystone"
+	ksdeploy "github.com/smartcontractkit/chainlink/deployment/keystone"
 	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"

deployment/.golangci.yml

@@ -0,0 +1,81 @@
+run:
+  timeout: 15m
+linters:
+  enable:
+    - exhaustive
+    - exportloopref
+    - revive
+    - goimports
+    - gosec
+    - misspell
+    - rowserrcheck
+    - errorlint
+linters-settings:
+  exhaustive:
+    default-signifies-exhaustive: true
+  goimports:
+    local-prefixes: github.com/smartcontractkit/chainlink
+  golint:
+    min-confidence: 0.999
+  gosec:
+    excludes:
+      - G101
+  govet:
+    enable:
+      - shadow
+  revive:
+    confidence: 0.8
+    rules:
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: dot-imports
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: if-return
+      - name: increment-decrement
+      # - name: var-naming // doesn't work with some generated names
+      - name: var-declaration
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf
+      - name: empty-block
+      - name: superfluous-else
+      #- name: unused-parameter
+      - name: unreachable-code
+      - name: redefines-builtin-id
+      - name: waitgroup-by-value
+      - name: unconditional-recursion
+      - name: struct-tag
+      - name: string-format
+      - name: string-of-int
+      - name: range-val-address
+      - name: range-val-in-closure
+      - name: modifies-value-receiver
+      - name: modifies-parameter
+      - name: identical-branches
+      - name: get-return
+      # - name: flag-parameter // probably one we should work on doing better at in the future
+      # - name: early-return // probably one we should work on doing better at in the future
+      - name: defer
+      - name: constant-logical-expr
+      - name: confusing-naming
+      - name: confusing-results
+      - name: bool-literal-in-expr
+      - name: atomic
+issues:
+  exclude-rules:
+    - path: memory/(.+)\.go
+      linters:
+        - revive
+    - text: "^G404: Use of weak random number generator"
+      linters:
+        - gosec
+    - linters:
+        - govet
+      text: "declaration of \"err\" shadows"

integration-tests/deployment/ccip/add_chain.go → deployment/ccip/add_chain.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_home"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"

integration-tests/deployment/ccip/add_chain_test.go → deployment/ccip/add_chain_test.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"

integration-tests/deployment/ccip/add_lane.go → deployment/ccip/add_lane.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"

integration-tests/deployment/ccip/add_lane_test.go → deployment/ccip/add_lane_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 

integration-tests/deployment/ccip/changeset/cap_reg.go → deployment/ccip/changeset/cap_reg.go

@@ -3,8 +3,8 @@ package changeset
 import (
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/proposal/timelock"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	ccipdeployment "github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip"
+	"github.com/smartcontractkit/chainlink/deployment"
+	ccipdeployment "github.com/smartcontractkit/chainlink/deployment/ccip"
 )
 
 // Separated changset because cap reg is an env var for CL nodes.

integration-tests/deployment/ccip/changeset/initial_deploy.go → deployment/ccip/changeset/initial_deploy.go

@@ -3,9 +3,9 @@ package changeset
 import (
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/proposal/timelock"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 
-	ccipdeployment "github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip"
+	ccipdeployment "github.com/smartcontractkit/chainlink/deployment/ccip"
 )
 
 // We expect the change set input to be unique per change set.

integration-tests/deployment/ccip/changeset/initial_deploy_test.go → deployment/ccip/changeset/initial_deploy_test.go

@@ -5,15 +5,15 @@ import (
 
 	cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
 	"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
+	"github.com/smartcontractkit/chainlink/deployment"
 
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 
 	jobv1 "github.com/smartcontractkit/chainlink-protos/job-distributor/v1/job"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	ccdeploy "github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip"
+	ccdeploy "github.com/smartcontractkit/chainlink/deployment/ccip"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 

integration-tests/deployment/ccip/deploy.go → deployment/ccip/deploy.go

@@ -18,7 +18,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_home"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/aggregator_v3_interface"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_home"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/maybe_revert_message_receiver"

integration-tests/deployment/ccip/deploy_home_chain.go → deployment/ccip/deploy_home_chain.go

@@ -27,7 +27,7 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 
 	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"

integration-tests/deployment/ccip/deploy_test.go → deployment/ccip/deploy_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/memory"
+	"github.com/smartcontractkit/chainlink/deployment"
+	"github.com/smartcontractkit/chainlink/deployment/memory"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )

integration-tests/deployment/ccip/jobs.go → deployment/ccip/jobs.go

@@ -1,7 +1,7 @@
 package ccipdeployment
 
 import (
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/validate"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 )

integration-tests/deployment/ccip/propose.go → deployment/ccip/propose.go

@@ -17,7 +17,7 @@ import (
 	chainsel "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 )
 
 var (

integration-tests/deployment/ccip/propose_home_chain.go → deployment/ccip/propose_home_chain.go

@@ -7,7 +7,7 @@ import (
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/proposal/mcms"
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/proposal/timelock"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 )
 

integration-tests/deployment/ccip/state.go → deployment/ccip/state.go

@@ -8,16 +8,16 @@ import (
 	"github.com/pkg/errors"
 	chainsel "github.com/smartcontractkit/chain-selectors"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/v1_0"
+	"github.com/smartcontractkit/chainlink/deployment"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_0"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/commit_store"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_home"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/v1_2"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/v1_5"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/v1_6"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_2"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_5"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_6"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_home"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"

integration-tests/deployment/ccip/test_assertions.go → deployment/ccip/test_assertions.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
 )
 

integration-tests/deployment/ccip/test_helpers.go → deployment/ccip/test_helpers.go

@@ -31,14 +31,14 @@ import (
 
 	jobv1 "github.com/smartcontractkit/chainlink-protos/job-distributor/v1/job"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/memory"
+	"github.com/smartcontractkit/chainlink/deployment"
+	"github.com/smartcontractkit/chainlink/deployment/memory"
 	"github.com/smartcontractkit/chainlink/integration-tests/docker/test_env"
 	"github.com/smartcontractkit/chainlink/integration-tests/testconfig"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/devenv"
+	"github.com/smartcontractkit/chainlink/deployment/devenv"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/mock_v3_aggregator_contract"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"

integration-tests/deployment/ccip/view/chain.go → deployment/ccip/view/chain.go

@@ -1,10 +1,10 @@
 package view
 
 import (
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/v1_0"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/v1_2"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/v1_5"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/v1_6"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_0"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_2"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_5"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_6"
 )
 
 type ChainView struct {

integration-tests/deployment/ccip/view/nops.go → deployment/ccip/view/nops.go

@@ -7,7 +7,7 @@ import (
 	chainsel "github.com/smartcontractkit/chain-selectors"
 
 	nodev1 "github.com/smartcontractkit/chainlink-protos/job-distributor/v1/node"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
+	"github.com/smartcontractkit/chainlink/deployment"
 )
 
 type NopsView struct {

integration-tests/deployment/ccip/view/v1_0/rmn_proxy_contract.go → deployment/ccip/view/v1_0/rmn_proxy_contract.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/types"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_proxy_contract"
 )
 

integration-tests/deployment/ccip/view/v1_2/router.go → deployment/ccip/view/v1_2/router.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment/ccip/view/types"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/view/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
 )