From 99266f82a6157b1d1e59672593bc45e09d402cd4 Mon Sep 17 00:00:00 2001
From: Rodolphe Fontaine <30529563+Rodi26@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:03:40 +0200
Subject: [PATCH] last version

---
 .../{docker-build.yml => docker-build.txt}    |  1 +
 .github/workflows/frogbot-scan-repository.yml | 56 -------------------
 .github/workflows/maven-build.yml             | 23 +-------
 .github/workflows/run-jmeter-test.yml         | 23 --------
 4 files changed, 2 insertions(+), 101 deletions(-)
 rename .github/workflows/{docker-build.yml => docker-build.txt} (93%)
 delete mode 100644 .github/workflows/frogbot-scan-repository.yml
 delete mode 100644 .github/workflows/run-jmeter-test.yml

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.txt
similarity index 93%
rename from .github/workflows/docker-build.yml
rename to .github/workflows/docker-build.txt
index cbde7f933..7ba083785 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.txt
@@ -1,3 +1,4 @@
+A test for image build and push to JFrog Artifactory
 ---
     name: Build to Docker Hub
     
diff --git a/.github/workflows/frogbot-scan-repository.yml b/.github/workflows/frogbot-scan-repository.yml
deleted file mode 100644
index fd848885d..000000000
--- a/.github/workflows/frogbot-scan-repository.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: "Frogbot Scan Repository"
-on:
-  workflow_dispatch:
-  schedule:
-    # The repository will be scanned once a day at 00:00 GMT.
-    - cron: "0 0 * * *"
-permissions:
-  contents: write
-  pull-requests: write
-  security-events: write
-  # [Mandatory If using OIDC authentication protocol instead of JF_ACCESS_TOKEN]
-  # id-token: write
-jobs:
-  scan-repository:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # The repository scanning will be triggered periodically on the following branches.
-        branch: ["main"]
-    steps:
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '21'
-      - uses: jfrog/frogbot@v2.9.2
-        env:
-          # [Mandatory]
-          # JFrog platform URL
-          JF_URL: ${{ secrets.JF_URL }}
-
-          # [Mandatory if JF_USER and JF_PASSWORD are not provided]
-          # JFrog access token with 'read' permissions on Xray service
-          JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}
-
-          # [Mandatory if JF_ACCESS_TOKEN is not provided]
-          # JFrog username with 'read' permissions for Xray. Must be provided with JF_PASSWORD
-          # JF_USER: ${{ secrets.JF_USER }}
-
-          # [Mandatory if JF_ACCESS_TOKEN is not provided]
-          # JFrog password. Must be provided with JF_USER
-          # JF_PASSWORD: ${{ secrets.JF_PASSWORD }}
-
-          # [Mandatory]
-          # The GitHub token is automatically generated for the job
-          JF_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-          # [Mandatory]
-          # The name of the branch on which Frogbot will perform the scan
-          JF_GIT_BASE_BRANCH: ${{ matrix.branch }}
-
-        # [Mandatory if using OIDC authentication protocol instead of JF_ACCESS_TOKEN]
-        # Insert to oidc-provider-name the 'Provider Name' defined in the OIDC integration configured in the JPD
-        # with:
-        #   oidc-provider-name: ""
-        #JF_PATH_EXCLUSIONS: "*gradle*"
\ No newline at end of file
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index fcb1101f6..b2e85696e 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -48,28 +48,6 @@ jobs:
 
 
 
-  Build_Container_and_push_to_Artifactory:
-    runs-on: ubuntu-latest
-    needs: Run_test
-    steps:
-    - name: checkout Git repository
-      uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'temurin' # See 'Supported distributions' for available options
-        java-version: '21'
-    - name: Login to Jfrog Artifactory
-      uses: docker/login-action@v3
-      with:
-        registry: rodi26.jfrog.io
-        username: 'rodolphe.fontaine@orange.fr'
-        password: ${{ secrets.JF_ACCESS_TOKEN }}
-    - name: Build and push
-      uses: docker/build-push-action@v6
-      with:
-        push: true
-        tags: rodi26.jfrog.io/rodi26-docker/spring-petclinic:latest
 
   scan-repository:
     runs-on: ubuntu-latest
@@ -153,6 +131,7 @@ jobs:
     
   build-and-tag:
     runs-on: ubuntu-latest
+    needs: Run_test
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/.github/workflows/run-jmeter-test.yml b/.github/workflows/run-jmeter-test.yml
deleted file mode 100644
index e4fb6768a..000000000
--- a/.github/workflows/run-jmeter-test.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Test Action
-on:
-  push
-jobs:
-  test-action:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '21' ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK ${{matrix.java}}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{matrix.java}}
-          distribution: 'adopt'
-          cache: maven
-      - name: Run JMeter Action on a test
-        uses: rbhadti94/apache-jmeter-action@v0.5.0
-        with:
-          testFilePath: src/test/jmeter/petclinic_test_plan.jmx
-          outputReportsFolder: reports/
-          args: "--loglevel INFO" 
\ No newline at end of file