From 87f9d12a10fc40cefc7fbe1e8b14d98ce68f8398 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Wed, 20 Apr 2022 09:25:48 -0500 Subject: [PATCH 1/7] ci: adding gcs missing steps --- .gitlab-ci.yml | 3 +++ devops/osdu/publish/compat-report-pages.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a8dd01..39ff5c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,9 @@ include: # ibm - local: "/devops/osdu/scanners/abi-check-sdapi-ibm.yml" + + # gcs + - local: "/devops/osdu/scanners/abi-check-sdapi-gcs.yml" # deploy # global diff --git a/devops/osdu/publish/compat-report-pages.yml b/devops/osdu/publish/compat-report-pages.yml index 6e51aeb..069f740 100644 --- a/devops/osdu/publish/compat-report-pages.yml +++ b/devops/osdu/publish/compat-report-pages.yml @@ -7,6 +7,7 @@ compat-reports-publish: - abi-check-for-sdapi-azure-curl - abi-check-for-sdapi-ibm - abi-check-for-sdapi-aws + - abi-check-for-sdapi-gcs - abi-check-for-sdapi-polycloud script: - mkdir public -- GitLab From da6469d0d6c6fb3562ebdb53edcea35e4f03dcdd Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Wed, 20 Apr 2022 09:37:35 -0500 Subject: [PATCH 2/7] ci: adding gcs missing steps --- .gitlab-ci.yml | 3 --- devops/osdu/deploy/gcs.yml | 6 ++++++ devops/osdu/deploy/global.yml | 3 ++- devops/osdu/publish/compat-report-pages.yml | 1 - 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39ff5c7..7a8dd01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,9 +61,6 @@ include: # ibm - local: "/devops/osdu/scanners/abi-check-sdapi-ibm.yml" - - # gcs - - local: "/devops/osdu/scanners/abi-check-sdapi-gcs.yml" # deploy # global diff --git a/devops/osdu/deploy/gcs.yml b/devops/osdu/deploy/gcs.yml index 5b7ec67..35c47f6 100644 --- a/devops/osdu/deploy/gcs.yml +++ b/devops/osdu/deploy/gcs.yml @@ -4,3 +4,9 @@ osdu-package-gcs: extends: .osdu-package dependencies: - compile-and-unit-test-gcs + script: + script: + - chmod +x ./devops/scripts/gen_version.sh + - PACKAGE_VERSION=$(./devops/scripts/gen_version.sh) + - tar --directory=sdapi-$PACKAGE_VERSION -cf - . | gzip > sdapi-$cloud_provider.tar.gz + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file sdapi-$cloud_provider.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/sdapi/$PACKAGE_VERSION/sdapi-$cloud_provider.tar.gz"' diff --git a/devops/osdu/deploy/global.yml b/devops/osdu/deploy/global.yml index c14e1fd..c6c334a 100644 --- a/devops/osdu/deploy/global.yml +++ b/devops/osdu/deploy/global.yml @@ -4,12 +4,13 @@ image: ubuntu dependencies: - clean-package - script: + before_script: - apt-get update - apt-get install curl -y - apt-get install tar -y - apt-get install gzip -y - apt-get install git -y + script: - chmod +x ./devops/scripts/gen_version.sh - PACKAGE_VERSION=$(./devops/scripts/gen_version.sh) - tar --directory=sdapi-$PACKAGE_VERSION -cf - . | gzip > sdapi-$cloud_provider.tar.gz diff --git a/devops/osdu/publish/compat-report-pages.yml b/devops/osdu/publish/compat-report-pages.yml index 069f740..6e51aeb 100644 --- a/devops/osdu/publish/compat-report-pages.yml +++ b/devops/osdu/publish/compat-report-pages.yml @@ -7,7 +7,6 @@ compat-reports-publish: - abi-check-for-sdapi-azure-curl - abi-check-for-sdapi-ibm - abi-check-for-sdapi-aws - - abi-check-for-sdapi-gcs - abi-check-for-sdapi-polycloud script: - mkdir public -- GitLab From 58fefb464c8ec41b21105574b61777b08bba7876 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Wed, 20 Apr 2022 09:38:24 -0500 Subject: [PATCH 3/7] ci: adding gcs missing steps --- devops/osdu/deploy/gcs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/devops/osdu/deploy/gcs.yml b/devops/osdu/deploy/gcs.yml index 35c47f6..a179e5b 100644 --- a/devops/osdu/deploy/gcs.yml +++ b/devops/osdu/deploy/gcs.yml @@ -5,7 +5,6 @@ osdu-package-gcs: dependencies: - compile-and-unit-test-gcs script: - script: - chmod +x ./devops/scripts/gen_version.sh - PACKAGE_VERSION=$(./devops/scripts/gen_version.sh) - tar --directory=sdapi-$PACKAGE_VERSION -cf - . | gzip > sdapi-$cloud_provider.tar.gz -- GitLab From 58ff9883ae788d17fe166cfa9efc8614ad398abc Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Wed, 20 Apr 2022 09:40:06 -0500 Subject: [PATCH 4/7] ci: adding gcs missing steps --- .gitlab-ci.yml | 12 ------------ devops/osdu/deploy/gcs.yml | 5 ----- devops/osdu/deploy/global.yml | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a8dd01..bfd2834 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,18 +66,6 @@ include: # global - local: "/devops/osdu/deploy/global.yml" - # polycloud - - local: "/devops/osdu/deploy/polycloud.yml" - - # azure - - local: "/devops/osdu/deploy/azure.yml" - - # aws - - local: "/devops/osdu/deploy/aws.yml" - - # ibm - - local: "/devops/osdu/deploy/ibm.yml" - # gcs - local: "/devops/osdu/deploy/gcs.yml" diff --git a/devops/osdu/deploy/gcs.yml b/devops/osdu/deploy/gcs.yml index a179e5b..5b7ec67 100644 --- a/devops/osdu/deploy/gcs.yml +++ b/devops/osdu/deploy/gcs.yml @@ -4,8 +4,3 @@ osdu-package-gcs: extends: .osdu-package dependencies: - compile-and-unit-test-gcs - script: - - chmod +x ./devops/scripts/gen_version.sh - - PACKAGE_VERSION=$(./devops/scripts/gen_version.sh) - - tar --directory=sdapi-$PACKAGE_VERSION -cf - . | gzip > sdapi-$cloud_provider.tar.gz - - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file sdapi-$cloud_provider.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/sdapi/$PACKAGE_VERSION/sdapi-$cloud_provider.tar.gz"' diff --git a/devops/osdu/deploy/global.yml b/devops/osdu/deploy/global.yml index c6c334a..5c75104 100644 --- a/devops/osdu/deploy/global.yml +++ b/devops/osdu/deploy/global.yml @@ -18,6 +18,4 @@ - mv compat_reports/sdapi/$cloud_provider compat_reports_${cloud_provider} - tar --directory=compat_reports_${cloud_provider} -cf - . | gzip > compat_reports_${cloud_provider}.tar.gz - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file compat_reports_${cloud_provider}.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/sdapi/$PACKAGE_VERSION/compat_reports_${cloud_provider}.tar.gz"' - only: - refs: - - master \ No newline at end of file + \ No newline at end of file -- GitLab From 183724ed9cb3a2ddf41713e264e0b9ecace534f7 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Wed, 20 Apr 2022 09:53:08 -0500 Subject: [PATCH 5/7] ci: adding gcs missing steps --- .gitlab-ci.yml | 15 +++++++++++++++ devops/osdu/deploy/global.yml | 4 +++- devops/osdu/publish/compat-report-pages.yml | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfd2834..39ff5c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,11 +61,26 @@ include: # ibm - local: "/devops/osdu/scanners/abi-check-sdapi-ibm.yml" + + # gcs + - local: "/devops/osdu/scanners/abi-check-sdapi-gcs.yml" # deploy # global - local: "/devops/osdu/deploy/global.yml" + # polycloud + - local: "/devops/osdu/deploy/polycloud.yml" + + # azure + - local: "/devops/osdu/deploy/azure.yml" + + # aws + - local: "/devops/osdu/deploy/aws.yml" + + # ibm + - local: "/devops/osdu/deploy/ibm.yml" + # gcs - local: "/devops/osdu/deploy/gcs.yml" diff --git a/devops/osdu/deploy/global.yml b/devops/osdu/deploy/global.yml index 5c75104..c6c334a 100644 --- a/devops/osdu/deploy/global.yml +++ b/devops/osdu/deploy/global.yml @@ -18,4 +18,6 @@ - mv compat_reports/sdapi/$cloud_provider compat_reports_${cloud_provider} - tar --directory=compat_reports_${cloud_provider} -cf - . | gzip > compat_reports_${cloud_provider}.tar.gz - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file compat_reports_${cloud_provider}.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/sdapi/$PACKAGE_VERSION/compat_reports_${cloud_provider}.tar.gz"' - \ No newline at end of file + only: + refs: + - master \ No newline at end of file diff --git a/devops/osdu/publish/compat-report-pages.yml b/devops/osdu/publish/compat-report-pages.yml index 6e51aeb..069f740 100644 --- a/devops/osdu/publish/compat-report-pages.yml +++ b/devops/osdu/publish/compat-report-pages.yml @@ -7,6 +7,7 @@ compat-reports-publish: - abi-check-for-sdapi-azure-curl - abi-check-for-sdapi-ibm - abi-check-for-sdapi-aws + - abi-check-for-sdapi-gcs - abi-check-for-sdapi-polycloud script: - mkdir public -- GitLab From fca80d1e448750aa0a7ba08ba241c1a8ce28910f Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Wed, 20 Apr 2022 12:51:22 -0500 Subject: [PATCH 6/7] ci: adding gcs missing steps --- .gitlab-ci.yml | 3 --- devops/osdu/deploy/gcs.yml | 5 +++++ devops/osdu/publish/compat-report-pages.yml | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39ff5c7..7a8dd01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,9 +61,6 @@ include: # ibm - local: "/devops/osdu/scanners/abi-check-sdapi-ibm.yml" - - # gcs - - local: "/devops/osdu/scanners/abi-check-sdapi-gcs.yml" # deploy # global diff --git a/devops/osdu/deploy/gcs.yml b/devops/osdu/deploy/gcs.yml index 5b7ec67..a179e5b 100644 --- a/devops/osdu/deploy/gcs.yml +++ b/devops/osdu/deploy/gcs.yml @@ -4,3 +4,8 @@ osdu-package-gcs: extends: .osdu-package dependencies: - compile-and-unit-test-gcs + script: + - chmod +x ./devops/scripts/gen_version.sh + - PACKAGE_VERSION=$(./devops/scripts/gen_version.sh) + - tar --directory=sdapi-$PACKAGE_VERSION -cf - . | gzip > sdapi-$cloud_provider.tar.gz + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file sdapi-$cloud_provider.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/sdapi/$PACKAGE_VERSION/sdapi-$cloud_provider.tar.gz"' diff --git a/devops/osdu/publish/compat-report-pages.yml b/devops/osdu/publish/compat-report-pages.yml index 069f740..6e51aeb 100644 --- a/devops/osdu/publish/compat-report-pages.yml +++ b/devops/osdu/publish/compat-report-pages.yml @@ -7,7 +7,6 @@ compat-reports-publish: - abi-check-for-sdapi-azure-curl - abi-check-for-sdapi-ibm - abi-check-for-sdapi-aws - - abi-check-for-sdapi-gcs - abi-check-for-sdapi-polycloud script: - mkdir public -- GitLab From 787e4359a3d1b26c38cdfbb827637e0ef5bdb846 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Wed, 20 Apr 2022 13:00:51 -0500 Subject: [PATCH 7/7] ci: adding gcs missing steps --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a8dd01..aacc0d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,4 +91,4 @@ include: # publish # abi compat report - - local: "/devops/osdu/publish/compat-report-pages.yml" \ No newline at end of file + - local: "/devops/osdu/publish/compat-report-pages.yml" -- GitLab