From ce96f2c945b4f57d643c15f2d7fde618e64b4d90 Mon Sep 17 00:00:00 2001
From: Peter Mikus <peter.mikus@protonmail.ch>
Date: Fri, 17 Mar 2023 13:20:59 +0000
Subject: feat(csit): Align job naming

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: Ifa70b50ae3e82c2fc784294220150b91e768d2fe
---
 jjb/csit/csit-terraform.yaml                        |  8 ++++----
 jjb/scripts/csit/terraform-aws-eb-version-deploy.sh |  4 ++--
 jjb/scripts/csit/terraform-aws-eb-version-upload.sh | 21 ---------------------
 jjb/scripts/csit/terraform-aws-eb-version-verify.sh | 21 +++++++++++++++++++++
 4 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 jjb/scripts/csit/terraform-aws-eb-version-upload.sh
 create mode 100644 jjb/scripts/csit/terraform-aws-eb-version-verify.sh

(limited to 'jjb')

diff --git a/jjb/csit/csit-terraform.yaml b/jjb/csit/csit-terraform.yaml
index 3a50ae4f6..debddc60c 100644
--- a/jjb/csit/csit-terraform.yaml
+++ b/jjb/csit/csit-terraform.yaml
@@ -17,7 +17,7 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-terraform-aws-eb-version-upload-{os}-{executor-arch}'
+      - 'csit-terraform-aws-eb-version-verify-{os}-{executor-arch}'
       - 'csit-terraform-aws-eb-version-deploy-{os}-{executor-arch}'
 
     project: 'csit'
@@ -28,7 +28,7 @@
     build-artifact-num-to-keep: 10
 
 - job-template:
-    name: 'csit-terraform-aws-eb-version-upload-{os}-{executor-arch}'
+    name: 'csit-terraform-aws-eb-version-verify-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -59,7 +59,7 @@
       - gerrit-trigger-csit-terraform:
           project: '{project}'
           branch: '{branch}'
-          trigger-word: 'terraform-cdash-upload'
+          trigger-word: 'terraform-cdash-verify'
           skip-vote: false
 
     builders:
@@ -68,7 +68,7 @@
           - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/csit/terraform-aws-eb-version-upload.sh
+          - ../scripts/csit/terraform-aws-eb-version-verify.sh
 
     publishers:
       - fdio-infra-publish
diff --git a/jjb/scripts/csit/terraform-aws-eb-version-deploy.sh b/jjb/scripts/csit/terraform-aws-eb-version-deploy.sh
index 250280d41..3bc683b91 100644
--- a/jjb/scripts/csit/terraform-aws-eb-version-deploy.sh
+++ b/jjb/scripts/csit/terraform-aws-eb-version-deploy.sh
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-echo "---> jjb/scripts/csit/cdash-deploy.sh"
+echo "---> jjb/scripts/csit/terraform-aws-eb-version-deploy.sh"
 
 set -exuo pipefail
 
 csit_entry_dir="${WORKSPACE}/resources/libraries/bash/entry"
-source "${csit_entry_dir}/bootstrap_cdash_deploy.sh"
\ No newline at end of file
+source "${csit_entry_dir}/bootstrap_aws_eb_version_deploy.sh"
diff --git a/jjb/scripts/csit/terraform-aws-eb-version-upload.sh b/jjb/scripts/csit/terraform-aws-eb-version-upload.sh
deleted file mode 100644
index 64bffedc2..000000000
--- a/jjb/scripts/csit/terraform-aws-eb-version-upload.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2023 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-echo "---> jjb/scripts/csit/cdash-upload.sh"
-
-set -exuo pipefail
-
-csit_entry_dir="${WORKSPACE}/resources/libraries/bash/entry"
-source "${csit_entry_dir}/bootstrap_cdash_upload.sh"
\ No newline at end of file
diff --git a/jjb/scripts/csit/terraform-aws-eb-version-verify.sh b/jjb/scripts/csit/terraform-aws-eb-version-verify.sh
new file mode 100644
index 000000000..7a9f16261
--- /dev/null
+++ b/jjb/scripts/csit/terraform-aws-eb-version-verify.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copyright (c) 2023 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/csit/terraform-aws-eb-version-verify.sh"
+
+set -exuo pipefail
+
+csit_entry_dir="${WORKSPACE}/resources/libraries/bash/entry"
+source "${csit_entry_dir}/bootstrap_aws_eb_version_verify.sh"
-- 
cgit 1.2.3-korg