[TT-1806] add required chain.link labels to k8s soak test (#944)

* add required chain.link labels to k8s soak test * tagged CTF + team input in the soak workflow * add missing import * fix compilation * fix CL version in go.mod * add missing var to e2e tests * use chainlink & integration-tests commit from develop branch * fix: add chainlink/deployment bump to updater workflow (#961) * Update Solana Client for LogPoller (#933) * Add required methods * Add GetBlocks * Add GetBlocks method --------- Co-authored-by: Aaron Lu <[email protected]> Co-authored-by: Dylan Tinianov <[email protected]>
smartcontractkit · Dec 6, 2024 · 77c4275 · 77c4275
1 parent f7ecca8
commit 77c4275
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml
@@ -8,6 +8,10 @@ on:
         required: true
         default: develop
         type: string
+      team:
+        description: Team to run the tests for (e.g. BIX, CCIP)
+        required: true
+        type: string        
 
 env:
   CL_ECR: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
@@ -335,6 +339,7 @@ jobs:
         env:
           E2E_TEST_CHAINLINK_IMAGE: ${{ env.CL_ECR }}          
           E2E_TEST_SOLANA_SECRET: thisisatestingonlysecret
+          CHAINLINK_USER_TEAM: ${{ github.event.inputs.team || 'BIX' }}
 
   e2e_program_upgrade_tests:
     name: E2E Program Upgrade Tests

diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml
@@ -11,6 +11,10 @@ on:
         description: 'Key to run tests with custom test secrets like ws url, rpc url, private key, etc.'
         required: false
         type: string         
+      team:
+        description: Team to run the tests for (e.g. BIX, CCIP)
+        required: true
+        type: string                
   schedule:
     - cron: '0 6 * * *'
 # Only run 1 of this workflow at a time per PR
@@ -175,4 +179,5 @@ jobs:
           E2E_TEST_COMMON_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }} # default private key
           E2E_TEST_COMMON_RPC_URL: https://api.devnet.solana.com # default url
           E2E_TEST_COMMON_WS_URL: https://api.devnet.solana.com # default url
-          E2E_TEST_SOLANA_SECRET: thisisatestingonlysecret
+          E2E_TEST_SOLANA_SECRET: thisisatestingonlysecret
+          CHAINLINK_USER_TEAM: ${{ github.event.inputs.team || 'BIX' }}
diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml
@@ -19,6 +19,11 @@ on:
         default: develop
         required: true
         type: string
+      team:
+        description: Team to run the tests for (e.g. BIX, CCIP)
+        required: true
+        type: string
+        default: BIX
 env:
   CL_ECR: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
   CONTRACT_ARTIFACTS_PATH: contracts/target/deploy
@@ -41,6 +46,7 @@ jobs:
   e2e_custom_build_artifacts:
     name: E2E Custom Build Artifacts
     environment: integration
+    runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: read
@@ -116,4 +122,5 @@ jobs:
           cache_key_id: solana-e2e-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "false"
         env:
-          E2E_TEST_SOLANA_SECRET: thisisatestingonlysecret
+          E2E_TEST_SOLANA_SECRET: thisisatestingonlysecret
+          CHAINLINK_USER_TEAM: ${{ inputs.team }}
diff --git a/integration-tests/common/common.go b/integration-tests/common/common.go
@@ -384,10 +384,24 @@ func BuildNodeContractPairID(node *client.ChainlinkClient, ocr2Addr string) (str
 }
 
 func (c *Common) Default(t *testing.T, namespacePrefix string) (*Common, error) {
+	productName := "data-feedsv2.0"
+	nsLabels, err := environment.GetRequiredChainLinkNamespaceLabels(productName, "soak")
+	if err != nil {
+		return nil, err
+	}
+
+	workloadPodLabels, err := environment.GetRequiredChainLinkWorkloadAndPodLabels(productName, "soak")
+	if err != nil {
+		return nil, err
+	}
+
 	c.TestEnvDetails.K8Config = &environment.Config{
 		NamespacePrefix: fmt.Sprintf("solana-%s", namespacePrefix),
 		TTL:             c.TestEnvDetails.TestDuration,
 		Test:            t,
+		Labels:          nsLabels,
+		WorkloadLabels:  workloadPodLabels,
+		PodLabels:       workloadPodLabels,
 	}
 
 	if *c.TestConfig.Common.InsideK8s {