From 447e7791e5bb3329dd3085273af44f79bbcbfa76 Mon Sep 17 00:00:00 2001 From: pat-s Date: Tue, 8 Oct 2024 20:59:45 +0200 Subject: [PATCH] require sslMode --- .woodpecker/build.yaml | 26 +++++++++++++------------- .woodpecker/warm_up_build.yaml | 22 +++++++++++----------- R/metadata-build.R | 3 ++- R/metadata-query.R | 6 ++++-- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index a798a5a..7f9580f 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -9,71 +9,71 @@ depends_on: matrix: include: - PLATFORM: redhat-9 - BLOCK: 8877:length(pkgs) + BLOCK: 14736:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - PLATFORM: redhat-8 - BLOCK: 8404:length(pkgs) + BLOCK: 14065:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - PLATFORM: ubuntu-2404 - BLOCK: 10665:length(pkgs) + BLOCK: 16953:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - PLATFORM: ubuntu-2204 - BLOCK: 11044:length(pkgs) + BLOCK: 19280:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - PLATFORM: alpine-320 - BLOCK: 8666:length(pkgs) + BLOCK: 15871:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - # ### AMD + # ### AMD - PLATFORM: redhat-9 - BLOCK: 9796:length(pkgs) + BLOCK: 17739:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cpx51 STRATEGY: multisession - PLATFORM: redhat-8 - BLOCK: 9611:length(pkgs) + BLOCK: 17534:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cpx51 STRATEGY: multisession - PLATFORM: ubuntu-2404 - BLOCK: 12753:length(pkgs) + BLOCK: 20732:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cpx51 STRATEGY: multisession - PLATFORM: ubuntu-2204 - BLOCK: 12885:length(pkgs) + BLOCK: 21389:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cpx51 STRATEGY: multisession - PLATFORM: alpine-320 - BLOCK: 8854:length(pkgs) + BLOCK: 15901:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi @@ -148,10 +148,10 @@ steps: resources: requests: memory: ${MEMORY} - cpu: 12000m + cpu: 4000m limits: memory: ${MEMORY} - cpu: 16000m + cpu: 4000m ### PROD-sequential # resources: # requests: diff --git a/.woodpecker/warm_up_build.yaml b/.woodpecker/warm_up_build.yaml index b7b7950..b4b571b 100644 --- a/.woodpecker/warm_up_build.yaml +++ b/.woodpecker/warm_up_build.yaml @@ -6,71 +6,71 @@ skip_clone: true matrix: include: - PLATFORM: redhat-9 - BLOCK: 8877:length(pkgs) + BLOCK: 14736:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - PLATFORM: redhat-8 - BLOCK: 8404:length(pkgs) + BLOCK: 14065:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - PLATFORM: ubuntu-2404 - BLOCK: 10665:length(pkgs) + BLOCK: 16953:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - PLATFORM: ubuntu-2204 - BLOCK: 11044:length(pkgs) + BLOCK: 19280:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - PLATFORM: alpine-320 - BLOCK: 8666:length(pkgs) + BLOCK: 15871:length(pkgs) ARCH: arm64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cax41 STRATEGY: multisession - # ### AMD + # ### AMD - PLATFORM: redhat-9 - BLOCK: 9796:length(pkgs) + BLOCK: 17739:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cpx51 STRATEGY: multisession - PLATFORM: redhat-8 - BLOCK: 9611:length(pkgs) + BLOCK: 17534:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cpx51 STRATEGY: multisession - PLATFORM: ubuntu-2404 - BLOCK: 12753:length(pkgs) + BLOCK: 20732:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cpx51 STRATEGY: multisession - PLATFORM: ubuntu-2204 - BLOCK: 12885:length(pkgs) + BLOCK: 21389:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi INSTANCE_TYPE: cpx51 STRATEGY: multisession - PLATFORM: alpine-320 - BLOCK: 8854:length(pkgs) + BLOCK: 15901:length(pkgs) ARCH: amd64 NCPUS: 2 MEMORY: 29Gi diff --git a/R/metadata-build.R b/R/metadata-build.R index 25b525b..eac2b6b 100644 --- a/R/metadata-build.R +++ b/R/metadata-build.R @@ -5,7 +5,8 @@ store_build_metadata <- function( force = FALSE, error = NA, build_duration = NA, size = NA) { con <- DBI::dbConnect(RPostgres::Postgres(), dbname = "build_metadata", host = "r-binaries.devxy.io", - port = 15432, user = "r_binaries", password = Sys.getenv("PGPASS") + port = 15432, user = "r_binaries", password = Sys.getenv("PGPASS"), + sslmode = "require" ) # Check if an entry with the same package_name and tag already exists diff --git a/R/metadata-query.R b/R/metadata-query.R index 40e1a8c..7f7c344 100644 --- a/R/metadata-query.R +++ b/R/metadata-query.R @@ -7,7 +7,8 @@ query_metadata_table <- function(table = "single_builds") { con <- DBI::dbConnect(RPostgres::Postgres(), dbname = "build_metadata", host = "r-binaries.devxy.io", - port = 15432, user = "r_binaries", password = Sys.getenv("PGPASS") + port = 15432, user = "r_binaries", password = Sys.getenv("PGPASS"), + sslmode = "require" ) metadata <- tbl(con, table) return(metadata) @@ -18,7 +19,8 @@ query_metadata_table <- function(table = "single_builds") { list_metadata_tables <- function() { con <- DBI::dbConnect(RPostgres::Postgres(), dbname = "build_metadata", host = "r-binaries.devxy.io", - port = 15432, user = "r_binaries", password = Sys.getenv("PGPASS") + port = 15432, user = "r_binaries", password = Sys.getenv("PGPASS"), + sslmode = "require" ) dbListTables(con) }