From 896397d3d6530494cdd1d5c2ee905fceda321cee Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Wed, 9 Oct 2024 12:45:47 +0300 Subject: [PATCH] test updated operator workflow with security nesting --- .github/workflows/integration_test.yaml | 3 ++- airbyte_rock/rockcraft.yaml | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index 638bb97..02fcfa0 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -9,7 +9,7 @@ on: jobs: integration-tests: - uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main + uses: kelkawi-a/operator-workflows/.github/workflows/integration_test.yaml@fc96d4589130d5cfdb96a1116b7284c3780d5fa5 secrets: inherit with: channel: 1.28-strict/stable @@ -18,3 +18,4 @@ jobs: self-hosted-runner: true self-hosted-runner-label: "xlarge" microk8s-addons: "dns ingress rbac storage metallb:10.15.119.2-10.15.119.4 registry" + rockcraft-enable-security-nesting: true diff --git a/airbyte_rock/rockcraft.yaml b/airbyte_rock/rockcraft.yaml index 12859b7..bdd66b2 100644 --- a/airbyte_rock/rockcraft.yaml +++ b/airbyte_rock/rockcraft.yaml @@ -117,10 +117,10 @@ parts: - docker.io build-snaps: - docker + - lxd stage-packages: - openjdk-21-jdk-headless # override-build: | - # mkdir -p # mkdir -p ./airbyte-db/jooq/build/libs && cp ${CRAFT_STAGE}/jooq-0.60.0.jar ./airbyte-db/jooq/build/libs/io.airbyte.airbyte-db-jooq-dev.jar # mkdir -p ./airbyte-db/db-lib/build/libs && cp ${CRAFT_STAGE}/db-lib-0.60.0.jar ./airbyte-db/db-lib/build/libs/io.airbyte.airbyte-db-db-lib-dev.jar # # unzip ./airbyte-db/jooq/build/libs/io.airbyte.airbyte-db-jooq-dev.jar && unzip ./airbyte-db/db-lib/build/libs/io.airbyte.airbyte-db-db-lib-dev.jar @@ -130,12 +130,13 @@ parts: override-build: | # git apply ${CRAFT_STAGE}/patches/*.patch # ./gradlew :airbyte-db:jooq:compileJava - mkdir -p ./airbyte-db/jooq/build/generated/jobsDatabase/src/main/java/ && cp ${CRAFT_STAGE}/jooq-0.60.0.jar ./airbyte-db/jooq/build/generated/jobsDatabase/src/main/java/io.airbyte.airbyte-db-jooq-dev.jar && unzip ./airbyte-db/jooq/build/generated/jobsDatabase/src/main/java/io.airbyte.airbyte-db-jooq-dev.jar -d ./airbyte-db/jooq/build/generated/jobsDatabase/src/main/java/ - ./gradlew generateJobsDatabaseJooq -x dockerBuildImage - ./gradlew generateConfigsDatabaseJooq -x dockerBuildImage + # mkdir -p ./airbyte-db/jooq/build/generated/jobsDatabase/src/main/java/ && cp ${CRAFT_STAGE}/jooq-0.60.0.jar ./airbyte-db/jooq/build/generated/jobsDatabase/src/main/java/io.airbyte.airbyte-db-jooq-dev.jar && unzip ./airbyte-db/jooq/build/generated/jobsDatabase/src/main/java/io.airbyte.airbyte-db-jooq-dev.jar -d ./airbyte-db/jooq/build/generated/jobsDatabase/src/main/java/ + # ./gradlew generateJobsDatabaseJooq -x dockerBuildImage + # ./gradlew generateConfigsDatabaseJooq -x dockerBuildImage # mkdir -p ./airbyte-db/db-lib/build/libs && cp ${CRAFT_STAGE}/db-lib-0.60.0.jar ./airbyte-db/db-lib/build/libs/io.airbyte.airbyte-db-db-lib-dev.jar # unzip ./airbyte-db/jooq/build/libs/io.airbyte.airbyte-db-jooq-dev.jar -d ./airbyte-db/jooq/build/libs/ && unzip ./airbyte-db/db-lib/build/libs/io.airbyte.airbyte-db-db-lib-dev.jar -d ./airbyte-db/db-lib/build/libs/ && ./gradlew assemble -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq --stacktrace - ./gradlew assemble -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq --stacktrace + # ./gradlew assemble -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq --stacktrace + ./gradlew build -x dockerBuildImage # ./gradlew :airbyte-server:assemble -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq # ./gradlew :airbyte-api-server:assemble -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq @@ -186,4 +187,4 @@ parts: # ./gradlew :airbyte-workers:distTar -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq -x :airbyte-data:kaptGenerateStubsKotlin # ./gradlew :airbyte-bootloader:distTar -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq -x :airbyte-data:kaptGenerateStubsKotlin # ./gradlew :airbyte-cron:distTar -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq -x :airbyte-data:kaptGenerateStubsKotlin - # ./gradlew :airbyte-connector-builder-server:distTar -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq -x :airbyte-data:kaptGenerateStubsKotlin \ No newline at end of file + # ./gradlew :airbyte-connector-builder-server:distTar -x dockerBuildImage -x :airbyte-db:jooq:generateConfigsDatabaseJooq -x :airbyte-db:jooq:generateJobsDatabaseJooq -x :airbyte-data:kaptGenerateStubsKotlin