fix test project name and key

sycured · Jul 31, 2023 · 1fde768 · 1fde768
1 parent d9cc40c
commit 1fde768
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,11 +66,11 @@ jobs:
           rustup self update
           rustup update --no-self-update
           curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-          cargo binstall -y cargo-quickinstall
+          cargo binstall -y --force cargo-quickinstall
 
       - name: Audit check
         run: |
-          cargo binstall -y cargo-audit
+          cargo binstall -y --force cargo-audit
           cargo audit --json > $HOME/audit.json || exit 0
 
       - name: Check a local package and all of its dependencies for errors
@@ -87,12 +87,12 @@ jobs:
 
       - name: Outdated check
         run: |
-          cargo binstall -y cargo-outdated
+          cargo binstall -y --force cargo-outdated
           cargo outdated --depth 1 --format json > $HOME/outdated.json
 
       - name: Udeps check
         run: |
-          cargo binstall -y cargo-udeps
+          cargo binstall -y --force cargo-udeps
           cargo +nightly udeps --quiet --workspace --all-features --all-targets --output json > $HOME/udeps.json || exit 0
 
       - name: Clippy check
@@ -102,7 +102,7 @@ jobs:
 
       - name: Sonar converter
         run: |
-          cargo binstall -y cargo-sonar
+          cargo binstall -y --force cargo-sonar
           cargo sonar --issues audit,clippy,outdated,udeps --audit-path $HOME/audit.json --clippy-path $HOME/clippy.json --outdated-path $HOME/outdated.json --udeps-path $HOME/udeps.json --issues-path $HOME/sonar.json
 
       - name: Setup sonarqube
@@ -156,6 +156,7 @@ jobs:
       - name: Run tests.sh
         run: ./tests.sh
         env:
+          GIT_ACTION_RUN_NUMBER: ${{ github.run_number }}
           JIRA_DOMAIN: ${{ secrets.JIRA_DOMAIN }}
           JIRA_USER: ${{ secrets.JIRA_USER }}
           JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}

diff --git a/.github/workflows/security_audit_cron.yml b/.github/workflows/security_audit_cron.yml
@@ -37,11 +37,11 @@ jobs:
           rustup self update
           rustup update --no-self-update
           curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-          cargo binstall -y cargo-quickinstall
+          cargo binstall -y --force cargo-quickinstall
 
       - name: Audit check
         run: |
-          cargo binstall -y cargo-audit
+          cargo binstall -y --force cargo-audit
           cargo audit --json > $HOME/audit.json || exit 0
 
       - name: Check a local package and all of its dependencies for errors
@@ -58,12 +58,12 @@ jobs:
 
       - name: Outdated check
         run: |
-          cargo binstall -y cargo-outdated
+          cargo binstall -y --force cargo-outdated
           cargo outdated --depth 1 --format json > $HOME/outdated.json
 
       - name: Udeps check
         run: |
-          cargo binstall -y cargo-udeps
+          cargo binstall -y --force cargo-udeps
           cargo +nightly udeps --quiet --workspace --all-features --all-targets --output json > $HOME/udeps.json || exit 0
 
       - name: Clippy check
@@ -73,7 +73,7 @@ jobs:
 
       - name: Sonar converter
         run: |
-          cargo binstall -y cargo-sonar
+          cargo binstall -y --force cargo-sonar
           cargo sonar --issues audit,clippy,outdated,udeps --audit-path $HOME/audit.json --clippy-path $HOME/clippy.json --outdated-path $HOME/outdated.json --udeps-path $HOME/udeps.json --issues-path $HOME/sonar.json
 
       - name: Setup sonarqube

diff --git a/test_project_destroy.exp b/test_project_destroy.exp
@@ -20,6 +20,6 @@ if {$force_conservative} {
 set timeout -1
 spawn $env(JIRA_CLI) project delete_project $env(JIRA_PROJECT_KEY)
 match_max 100000
-expect -exact "Are you sure you want to delete the project key: CITS? \[y/n\] \[?25l"
+expect -exact "Are you sure you want to delete the project key: $env(JIRA_PROJECT_KEY)? \[y/n\] \[?25l"
 send -- "y"
 expect eof
diff --git a/tests.sh b/tests.sh
@@ -9,7 +9,8 @@
 
 set -e
 export JIRA_CLI="./target/debug/jira_cli"
-export JIRA_PROJECT_KEY="CITS"
+export JIRA_PROJECT_NAME="ci-$GIT_ACTION_RUN_NUMBER"
+export JIRA_PROJECT_KEY="CI$GIT_ACTION_RUN_NUMBER"
 export JIRA_VERSION_NAME="v0.0.0"
 
 # version
@@ -37,7 +38,7 @@ echo "$JIRA_USER_ACCOUNT_ID"
 # project
 ## create
 echo "project create"
-$JIRA_CLI project create citest CITS "$JIRA_USER_ACCOUNT_ID"
+$JIRA_CLI project create $JIRA_PROJECT_NAME $JIRA_PROJECT_KEY "$JIRA_USER_ACCOUNT_ID"
 ## get_id
 echo "project get_id"
 $JIRA_CLI project get_id $JIRA_PROJECT_KEY