From ed3b9be6af8a1b47d80c82fc38ea212313371152 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Thu, 5 Sep 2024 14:07:37 -0700 Subject: [PATCH] APIGOV-28133 - use common twistlock on-schedule jobs --- .gitlab-ci.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff50ac1..5d77bcc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,29 +88,9 @@ twistlock-traceability: - cd .. twistlock-discovery:on-schedule: - extends: .twistlock - rules: - - !reference [.mirror-schedule-csr-rules, rules] - dependencies: [] variables: - # need to override this variable for github agents because the tag will need the 'v' if it exists - NO_V_RELEASE_TAG_REGEX: "^v?[0-9]{1,}\\.[0-9]{1,}\\.[0-9]{1,}$" - before_script: - - !reference [.get-agent-last-tag, script] - - echo "Using the last tagged version ${LAST_TAG_VERSION}" - - export IMAGE_NAME=ghcr.io/axway/apigee_discovery_agent:${LAST_TAG_VERSION} - - docker pull ${IMAGE_NAME} + AGENT_NAME: "apigee_discovery_agent" twistlock-traceability:on-schedule: - extends: .twistlock - rules: - - !reference [.mirror-schedule-csr-rules, rules] - dependencies: [] variables: - # need to override this variable for github agents because the tag will need the 'v' if it exists - NO_V_RELEASE_TAG_REGEX: "^v?[0-9]{1,}\\.[0-9]{1,}\\.[0-9]{1,}$" - before_script: - - !reference [.get-agent-last-tag, script] - - echo "Using the last tagged version ${LAST_TAG_VERSION}" - - export IMAGE_NAME=ghcr.io/axway/apigee_traceability_agent:${LAST_TAG_VERSION} - - docker pull ${IMAGE_NAME} + AGENT_NAME: "apigee_traceability_agent"