From 91b9b80f4557989e3fbbd1c2f588b2193e14aa98 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 28 Aug 2019 20:30:35 +0000 Subject: [PATCH 01/17] Add ostreedev/ostree and projectatomic/rpm-ostree Currently, these projects are using [PAPR](https://github.com/projectatomic/papr/) which today uses RHT-internal OpenStack which has reliability problems. There's no reason not for us to add some usage of Prow as an additional CI context; all we're doing is a build, no tests. I am strongly considering switching to Prow as a "merge bot" too, i.e. using `/lgtm` etc. But this is just a first step. --- ci-operator/config/ostreedev/ostree/OWNERS | 6 ++++ .../ostree/ostreedev-ostree-master.yaml | 30 +++++++++++++++++ .../config/projectatomic/rpm-ostree/OWNERS | 6 ++++ .../projectatomic-rpm-ostree-master.yaml | 33 +++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 ci-operator/config/ostreedev/ostree/OWNERS create mode 100644 ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml create mode 100644 ci-operator/config/projectatomic/rpm-ostree/OWNERS create mode 100644 ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml diff --git a/ci-operator/config/ostreedev/ostree/OWNERS b/ci-operator/config/ostreedev/ostree/OWNERS new file mode 100644 index 0000000000000..3eeb9c96f4efd --- /dev/null +++ b/ci-operator/config/ostreedev/ostree/OWNERS @@ -0,0 +1,6 @@ +# TODO: auto-populate this better +approvers: +- ashcrow +- miabbott +- cgwalters +- jlebon diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml new file mode 100644 index 0000000000000..f780a3dada232 --- /dev/null +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -0,0 +1,30 @@ +base_images: + f30: + cluster: https://api.ci.openshift.org + name: fedora + namespace: rhcos + tag: "30" + +build_root: + project_image: + dockerfile_path: ci/prow/Dockerfile + +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 1000m + memory: 1Gi + unit: + limits: + memory: 9Gi + requests: + cpu: '3' + memory: 5Gi + +tests: +- as: yaml-lint + commands: dist/prow_yaml_lint.sh + container: + from: src diff --git a/ci-operator/config/projectatomic/rpm-ostree/OWNERS b/ci-operator/config/projectatomic/rpm-ostree/OWNERS new file mode 100644 index 0000000000000..3eeb9c96f4efd --- /dev/null +++ b/ci-operator/config/projectatomic/rpm-ostree/OWNERS @@ -0,0 +1,6 @@ +# TODO: auto-populate this better +approvers: +- ashcrow +- miabbott +- cgwalters +- jlebon diff --git a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml new file mode 100644 index 0000000000000..074cf5a976fb9 --- /dev/null +++ b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml @@ -0,0 +1,33 @@ +base_images: + cosa: + cluster: https://api.ci.openshift.org + namespace: rhcos + name: coreos-assembler + tag: master + +build_root: + image_stream_tag: + cluster: https://api.ci.openshift.org + namespace: rhcos + name: coreos-assembler + tag: master + +images: +- dockerfile_path: ci/prow/Dockerfile + from: cosa + to: rpm-ostree-ci + +tests: +- as: sanity + commands: rpm-ostree --version + container: + from: rpm-ostree-ci + +resources: + '*': + limits: + memory: 6Gi + requests: + cpu: 1000m + memory: 1Gi + From 6f88681f64d38e26fdd8ccd057a4b4051406210d Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 30 Aug 2019 14:17:51 +0200 Subject: [PATCH 02/17] Generate ostree tests from existing files and rework ostree/rpm-ostree configs --- .../ostree/ostreedev-ostree-master.yaml | 18 ++-- .../projectatomic-rpm-ostree-master.yaml | 16 ++-- .../ostreedev-ostree-master-presubmits.yaml | 90 +++++++++++++++++++ ...ctatomic-rpm-ostree-master-presubmits.yaml | 90 +++++++++++++++++++ 4 files changed, 203 insertions(+), 11 deletions(-) create mode 100644 ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml create mode 100644 ci-operator/jobs/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master-presubmits.yaml diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index f780a3dada232..dc50c1340ff40 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -6,8 +6,16 @@ base_images: tag: "30" build_root: - project_image: - dockerfile_path: ci/prow/Dockerfile + image_stream_tag: + cluster: https://api.ci.openshift.org + name: release + namespace: openshift + tag: golang-1.10 + +images: +- from: f30 + dockerfile_path: ci/prow/Dockerfile + to: ostree-ci resources: '*': @@ -24,7 +32,7 @@ resources: memory: 5Gi tests: -- as: yaml-lint - commands: dist/prow_yaml_lint.sh +- as: sanity + commands: ostree --version container: - from: src + from: ostree-ci diff --git a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml index 074cf5a976fb9..7df296266a439 100644 --- a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml +++ b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml @@ -1,4 +1,9 @@ base_images: + f30: + cluster: https://api.ci.openshift.org + name: fedora + namespace: rhcos + tag: "30" cosa: cluster: https://api.ci.openshift.org namespace: rhcos @@ -8,13 +13,13 @@ base_images: build_root: image_stream_tag: cluster: https://api.ci.openshift.org - namespace: rhcos - name: coreos-assembler - tag: master + name: release + namespace: openshift + tag: golang-1.10 images: -- dockerfile_path: ci/prow/Dockerfile - from: cosa +- from: f30 + dockerfile_path: ci/prow/Dockerfile to: rpm-ostree-ci tests: @@ -30,4 +35,3 @@ resources: requests: cpu: 1000m memory: 1Gi - diff --git a/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml b/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml new file mode 100644 index 0000000000000..f134d54a1d9a1 --- /dev/null +++ b/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml @@ -0,0 +1,90 @@ +presubmits: + ostreedev/ostree: + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-ostreedev-ostree-master-images + rerun_command: /test images + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=[images] + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: ostreedev-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/sanity + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-ostreedev-ostree-master-sanity + rerun_command: /test sanity + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=sanity + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: ostreedev-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )sanity,?($|\s.*) diff --git a/ci-operator/jobs/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master-presubmits.yaml b/ci-operator/jobs/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master-presubmits.yaml new file mode 100644 index 0000000000000..5fa772aca2868 --- /dev/null +++ b/ci-operator/jobs/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master-presubmits.yaml @@ -0,0 +1,90 @@ +presubmits: + projectatomic/rpm-ostree: + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-projectatomic-rpm-ostree-master-images + rerun_command: /test images + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=[images] + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: projectatomic-rpm-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/sanity + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-projectatomic-rpm-ostree-master-sanity + rerun_command: /test sanity + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=sanity + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: projectatomic-rpm-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )sanity,?($|\s.*) From 587ca2aecfa7e121065cdeb245b81406576640b3 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 30 Aug 2019 17:47:30 +0200 Subject: [PATCH 03/17] rpmostree - use existing cosa to make a new cosa buildroot --- .../projectatomic-rpm-ostree-master.yaml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml index 7df296266a439..5689371ffd307 100644 --- a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml +++ b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml @@ -1,14 +1,9 @@ base_images: - f30: + cosa-buildroot: cluster: https://api.ci.openshift.org - name: fedora - namespace: rhcos - tag: "30" - cosa: - cluster: https://api.ci.openshift.org - namespace: rhcos - name: coreos-assembler - tag: master + namespace: coreos + name: cosa-buildroot + tag: latest build_root: image_stream_tag: @@ -18,7 +13,7 @@ build_root: tag: golang-1.10 images: -- from: f30 +- from: cosa-buildroot dockerfile_path: ci/prow/Dockerfile to: rpm-ostree-ci From ab68450deeeffeee7e643363ac4f0e9cb16dd12f Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 2 Sep 2019 11:38:33 +0200 Subject: [PATCH 04/17] ci-operator/config/ostreedev/ostree/ostreedev-ostree-master: make install in sanity test --- .../config/ostreedev/ostree/ostreedev-ostree-master.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index dc50c1340ff40..77b36512bbc84 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -33,6 +33,9 @@ resources: tests: - as: sanity - commands: ostree --version + commands: | + cd /src + make install + ostree --version container: from: ostree-ci From 03f16a29d4fafda57395cd0c322d045ecfa543e2 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 2 Sep 2019 12:02:51 +0200 Subject: [PATCH 05/17] ci-operator/config/ostreedev/ostree/ostreedev-ostree-master: add more ostree tests --- .../ostree/ostreedev-ostree-master.yaml | 54 +++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index 77b36512bbc84..41ce5d347dbee 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -31,11 +31,59 @@ resources: cpu: '3' memory: 5Gi +# TODO move all these scripts to ci/prow tests: - as: sanity + commands: make install && ostree --version + container: + from: ostree-ci +- as: minimal + commands: | + export CONFIGOPTS='--without-curl --without-soup --disable-gtk-doc --disable-man --disable-rust --without-libarchive --without-selinux --without-smack --without-openssl --without-avahi --without-libmount --disable-rofiles-fuse --disable-experimental-api' + make clean + ci/build.sh + container: + from: ostree-ci +- as: primary + commands: | + export CFLAGS='-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2' + export GI_SCANNERFLAGS='--warn-error' + export ASAN_OPTIONS='detect_leaks=0' + export CONFIGOPTS='--with-curl --with-openssl' + make clean + ci/ci-commitmessage-submodules.sh + ci/build-check.sh + ci/ci-release-build.sh + make dist-then-build + container: + from: ostree-ci +- as: rust + commands: | + export CONFIGOPTS='--enable-rust' + make clean + ci/build.sh + make check TESTS=tests/test-rollsum + container: + from: ostree-ci +- as: gnutls + commands: | + export CONFIGOPTS='--with-crypto=gnutls' + make clean + ci/build.sh + make check TESTS=tests/test-basic.sh + container: + from: ostree-ci +- as: libsoup + commands: | + export CONFIGOPTS='--without-curl --without-openssl --with-soup' + make clean + ci/build-check.sh + container: + from: ostree-ci +- as: introspection commands: | - cd /src - make install - ostree --version + export INSTALLED_TESTS_PATTERN='libostree/test-sizes.js libostree/test-sysroot.js libostree/test-core.js' + make clean + ci/build-check.sh container: from: ostree-ci From f855e0fc7408e7fbf16770842c286428bfdfa5da Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 2 Sep 2019 12:03:26 +0200 Subject: [PATCH 06/17] ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master: use f30 in rpmostree for now --- .../rpm-ostree/projectatomic-rpm-ostree-master.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml index 5689371ffd307..9cd6ccc767f1f 100644 --- a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml +++ b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml @@ -1,9 +1,12 @@ base_images: cosa-buildroot: cluster: https://api.ci.openshift.org - namespace: coreos - name: cosa-buildroot - tag: latest + # namespace: coreos + # name: cosa-buildroot + # tag: latest + name: fedora + namespace: rhcos + tag: "30" build_root: image_stream_tag: From 50b935c30942dd33b4eb87f2281da121677eacb9 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 2 Sep 2019 12:14:11 +0200 Subject: [PATCH 07/17] Generate new jobs for ostree --- .../ostreedev-ostree-master-presubmits.yaml | 264 ++++++++++++++++++ 1 file changed, 264 insertions(+) diff --git a/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml b/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml index f134d54a1d9a1..50e54fde57a03 100644 --- a/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml +++ b/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml @@ -1,5 +1,49 @@ presubmits: ostreedev/ostree: + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/gnutls + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-ostreedev-ostree-master-gnutls + rerun_command: /test gnutls + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=gnutls + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: ostreedev-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )gnutls,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -44,6 +88,226 @@ presubmits: secret: secretName: sentry-dsn trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/introspection + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-ostreedev-ostree-master-introspection + rerun_command: /test introspection + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=introspection + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: ostreedev-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )introspection,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/libsoup + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-ostreedev-ostree-master-libsoup + rerun_command: /test libsoup + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=libsoup + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: ostreedev-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )libsoup,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/minimal + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-ostreedev-ostree-master-minimal + rerun_command: /test minimal + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=minimal + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: ostreedev-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )minimal,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/primary + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-ostreedev-ostree-master-primary + rerun_command: /test primary + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=primary + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: ostreedev-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )primary,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/rust + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-ostreedev-ostree-master-rust + rerun_command: /test rust + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=rust + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: ostreedev-ostree-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )rust,?($|\s.*) - agent: kubernetes always_run: true branches: From b0b5db6f026996c2b6e1a8b759986ee82ad498fe Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 12:30:38 +0200 Subject: [PATCH 08/17] ci-operator/config/ostreedev/ostree/ostreedev-ostree-master: use sudo? --- .../ostree/ostreedev-ostree-master.yaml | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index 41ce5d347dbee..6553476ec590f 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -34,56 +34,56 @@ resources: # TODO move all these scripts to ci/prow tests: - as: sanity - commands: make install && ostree --version - container: - from: ostree-ci -- as: minimal - commands: | - export CONFIGOPTS='--without-curl --without-soup --disable-gtk-doc --disable-man --disable-rust --without-libarchive --without-selinux --without-smack --without-openssl --without-avahi --without-libmount --disable-rofiles-fuse --disable-experimental-api' - make clean - ci/build.sh - container: - from: ostree-ci -- as: primary - commands: | - export CFLAGS='-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2' - export GI_SCANNERFLAGS='--warn-error' - export ASAN_OPTIONS='detect_leaks=0' - export CONFIGOPTS='--with-curl --with-openssl' - make clean - ci/ci-commitmessage-submodules.sh - ci/build-check.sh - ci/ci-release-build.sh - make dist-then-build - container: - from: ostree-ci -- as: rust - commands: | - export CONFIGOPTS='--enable-rust' - make clean - ci/build.sh - make check TESTS=tests/test-rollsum - container: - from: ostree-ci -- as: gnutls - commands: | - export CONFIGOPTS='--with-crypto=gnutls' - make clean - ci/build.sh - make check TESTS=tests/test-basic.sh - container: - from: ostree-ci -- as: libsoup - commands: | - export CONFIGOPTS='--without-curl --without-openssl --with-soup' - make clean - ci/build-check.sh - container: - from: ostree-ci -- as: introspection - commands: | - export INSTALLED_TESTS_PATTERN='libostree/test-sizes.js libostree/test-sysroot.js libostree/test-core.js' - make clean - ci/build-check.sh + commands: sudo make install && ostree --version container: from: ostree-ci +# - as: minimal +# commands: | +# export CONFIGOPTS='--without-curl --without-soup --disable-gtk-doc --disable-man --disable-rust --without-libarchive --without-selinux --without-smack --without-openssl --without-avahi --without-libmount --disable-rofiles-fuse --disable-experimental-api' +# make clean +# ci/build.sh +# container: +# from: ostree-ci +# - as: primary +# commands: | +# export CFLAGS='-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2' +# export GI_SCANNERFLAGS='--warn-error' +# export ASAN_OPTIONS='detect_leaks=0' +# export CONFIGOPTS='--with-curl --with-openssl' +# make clean +# ci/ci-commitmessage-submodules.sh +# ci/build-check.sh +# ci/ci-release-build.sh +# make dist-then-build +# container: +# from: ostree-ci +# - as: rust +# commands: | +# export CONFIGOPTS='--enable-rust' +# make clean +# ci/build.sh +# make check TESTS=tests/test-rollsum +# container: +# from: ostree-ci +# - as: gnutls +# commands: | +# export CONFIGOPTS='--with-crypto=gnutls' +# make clean +# ci/build.sh +# make check TESTS=tests/test-basic.sh +# container: +# from: ostree-ci +# - as: libsoup +# commands: | +# export CONFIGOPTS='--without-curl --without-openssl --with-soup' +# make clean +# ci/build-check.sh +# container: +# from: ostree-ci +# - as: introspection +# commands: | +# export INSTALLED_TESTS_PATTERN='libostree/test-sizes.js libostree/test-sysroot.js libostree/test-core.js' +# make clean +# ci/build-check.sh +# container: +# from: ostree-ci From 358461a1ca323c19d548625b3b991e7fb9a7ab37 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 12:45:35 +0200 Subject: [PATCH 09/17] passwd hack --- .../ostreedev/ostree/ostreedev-ostree-master.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index 6553476ec590f..3d723822423a3 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -31,12 +31,19 @@ resources: cpu: '3' memory: 5Gi +test_binary_build_commands: | + set -eo pipefail + chmod uga+w /etc/passwd + # TODO move all these scripts to ci/prow tests: - as: sanity - commands: sudo make install && ostree --version + commands: | + set -o pipefail + echo "${USER:-default}:x:$(id -u):$(id -g):Default User:$HOME:/sbin/nologin" >> /etc/passwd + sudo make install && ostree --version container: - from: ostree-ci + from: test-bin # - as: minimal # commands: | # export CONFIGOPTS='--without-curl --without-soup --disable-gtk-doc --disable-man --disable-rust --without-libarchive --without-selinux --without-smack --without-openssl --without-avahi --without-libmount --disable-rofiles-fuse --disable-experimental-api' From 609a5f935f9a24659f65b00dbe7b0b53d78adcf9 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 12:57:49 +0200 Subject: [PATCH 10/17] ci-operator/config/ostreedev/ostree/ostreedev-ostree-master: run make install in raw_steps --- .../ostree/ostreedev-ostree-master.yaml | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index 3d723822423a3..96be65cbc0a68 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -12,11 +12,6 @@ build_root: namespace: openshift tag: golang-1.10 -images: -- from: f30 - dockerfile_path: ci/prow/Dockerfile - to: ostree-ci - resources: '*': limits: @@ -31,19 +26,30 @@ resources: cpu: '3' memory: 5Gi -test_binary_build_commands: | - set -eo pipefail - chmod uga+w /etc/passwd +raw_steps: +- sanity_install: + commands: | + cat < /opt/Dockerfile + FROM ostree-ci + RUN make install + DOCKERFILE + from: ostree-ci + to: ostree-ci-sanity + +images: +- from: f30 + to: ostree-ci + dockerfile_path: ci/prow/Dockerfile +- from: ostree-ci + to: ostree-ci-sanity + dockerfile_path: /opt/Dockerfile # TODO move all these scripts to ci/prow tests: - as: sanity - commands: | - set -o pipefail - echo "${USER:-default}:x:$(id -u):$(id -g):Default User:$HOME:/sbin/nologin" >> /etc/passwd - sudo make install && ostree --version + commands: ostree --version container: - from: test-bin + from: ostree-ci-sanity # - as: minimal # commands: | # export CONFIGOPTS='--without-curl --without-soup --disable-gtk-doc --disable-man --disable-rust --without-libarchive --without-selinux --without-smack --without-openssl --without-avahi --without-libmount --disable-rofiles-fuse --disable-experimental-api' From 53b175b7f3f1df27a290061232a7e6f2296503ac Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 13:10:09 +0200 Subject: [PATCH 11/17] Update jobs --- .../ostreedev-ostree-master-presubmits.yaml | 264 ------------------ 1 file changed, 264 deletions(-) diff --git a/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml b/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml index 50e54fde57a03..f134d54a1d9a1 100644 --- a/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml +++ b/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-master-presubmits.yaml @@ -1,49 +1,5 @@ presubmits: ostreedev/ostree: - - agent: kubernetes - always_run: true - branches: - - master - context: ci/prow/gnutls - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ostreedev-ostree-master-gnutls - rerun_command: /test gnutls - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=gnutls - command: - - ci-operator - env: - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: ostreedev-ostree-master.yaml - name: ci-operator-master-configs - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )gnutls,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -88,226 +44,6 @@ presubmits: secret: secretName: sentry-dsn trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - master - context: ci/prow/introspection - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ostreedev-ostree-master-introspection - rerun_command: /test introspection - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=introspection - command: - - ci-operator - env: - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: ostreedev-ostree-master.yaml - name: ci-operator-master-configs - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )introspection,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - master - context: ci/prow/libsoup - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ostreedev-ostree-master-libsoup - rerun_command: /test libsoup - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=libsoup - command: - - ci-operator - env: - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: ostreedev-ostree-master.yaml - name: ci-operator-master-configs - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )libsoup,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - master - context: ci/prow/minimal - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ostreedev-ostree-master-minimal - rerun_command: /test minimal - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=minimal - command: - - ci-operator - env: - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: ostreedev-ostree-master.yaml - name: ci-operator-master-configs - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )minimal,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - master - context: ci/prow/primary - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ostreedev-ostree-master-primary - rerun_command: /test primary - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=primary - command: - - ci-operator - env: - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: ostreedev-ostree-master.yaml - name: ci-operator-master-configs - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )primary,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - master - context: ci/prow/rust - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ostreedev-ostree-master-rust - rerun_command: /test rust - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=rust - command: - - ci-operator - env: - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: ostreedev-ostree-master.yaml - name: ci-operator-master-configs - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )rust,?($|\s.*) - agent: kubernetes always_run: true branches: From 90cd010e5822660ba0ba4553b4ba73894f1f2cf5 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 13:16:34 +0200 Subject: [PATCH 12/17] no arbitrary names in steps --- .../config/ostreedev/ostree/ostreedev-ostree-master.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index 96be65cbc0a68..f779493cdcb70 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -27,14 +27,14 @@ resources: memory: 5Gi raw_steps: -- sanity_install: +- pipeline_image_cache_step: commands: | - cat < /opt/Dockerfile + cat < ci/prow/Dockerfile.sanity FROM ostree-ci RUN make install DOCKERFILE from: ostree-ci - to: ostree-ci-sanity + to: ostree-ci-dockerfile images: - from: f30 @@ -42,7 +42,7 @@ images: dockerfile_path: ci/prow/Dockerfile - from: ostree-ci to: ostree-ci-sanity - dockerfile_path: /opt/Dockerfile + dockerfile_path: ci/prow/Dockerfile.sanity # TODO move all these scripts to ci/prow tests: From ca92ba0b9730720b8d9eec1da19fa247e2645ce1 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 13:50:39 +0200 Subject: [PATCH 13/17] ci-operator/config/ostreedev/ostree/ostreedev-ostree-master: add imagebuild step --- .../ostreedev/ostree/ostreedev-ostree-master.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index f779493cdcb70..cc89ac1f4240e 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -29,18 +29,28 @@ resources: raw_steps: - pipeline_image_cache_step: commands: | - cat < ci/prow/Dockerfile.sanity + cat < /opt/Dockerfile.sanity FROM ostree-ci RUN make install DOCKERFILE from: ostree-ci to: ostree-ci-dockerfile +- project_directory_image_build_step: + from: f30 + inputs: + ostree-ci: + paths: null + ostree-ci-dockerfile: + paths: + - destination_dir: . + source_path: ci/prow/Dockerfile.sanity + to: ostree-ci-sanity images: - from: f30 to: ostree-ci dockerfile_path: ci/prow/Dockerfile -- from: ostree-ci +- from: f30 to: ostree-ci-sanity dockerfile_path: ci/prow/Dockerfile.sanity From 674c91a1a4668698c4d8cc7cae67c303d61ed8fa Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 13:57:51 +0200 Subject: [PATCH 14/17] ci-operator/config/ostreedev/ostree/ostreedev-ostree-master: foo --- .../config/ostreedev/ostree/ostreedev-ostree-master.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index cc89ac1f4240e..bdff810817ac7 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -36,10 +36,8 @@ raw_steps: from: ostree-ci to: ostree-ci-dockerfile - project_directory_image_build_step: - from: f30 + from: ostree-ci inputs: - ostree-ci: - paths: null ostree-ci-dockerfile: paths: - destination_dir: . @@ -50,7 +48,7 @@ images: - from: f30 to: ostree-ci dockerfile_path: ci/prow/Dockerfile -- from: f30 +- from: ostree-ci to: ostree-ci-sanity dockerfile_path: ci/prow/Dockerfile.sanity From 6545b3d5494b5d4b53ce0734896f6c8d2d2b5d64 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 14:11:29 +0200 Subject: [PATCH 15/17] ci-operator/config/ostreedev/ostree/ostreedev-ostree-master: rename files --- .../ostree/ostreedev-ostree-master.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index bdff810817ac7..24461ecce26fd 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -29,27 +29,27 @@ resources: raw_steps: - pipeline_image_cache_step: commands: | - cat < /opt/Dockerfile.sanity + cat < /src/ci/prow/Dockerfile.sanity FROM ostree-ci RUN make install DOCKERFILE - from: ostree-ci - to: ostree-ci-dockerfile + from: buildroot + to: sanity-dockerfile - project_directory_image_build_step: - from: ostree-ci + from: buildroot inputs: - ostree-ci-dockerfile: + sanity-dockerfile: paths: - destination_dir: . - source_path: ci/prow/Dockerfile.sanity - to: ostree-ci-sanity + source_path: /src/ci/prow/Dockerfile.sanity + to: sanity-src images: - from: f30 - to: ostree-ci + to: buildroot dockerfile_path: ci/prow/Dockerfile -- from: ostree-ci - to: ostree-ci-sanity +- from: sanity-src + to: sanity dockerfile_path: ci/prow/Dockerfile.sanity # TODO move all these scripts to ci/prow @@ -57,7 +57,7 @@ tests: - as: sanity commands: ostree --version container: - from: ostree-ci-sanity + from: sanity # - as: minimal # commands: | # export CONFIGOPTS='--without-curl --without-soup --disable-gtk-doc --disable-man --disable-rust --without-libarchive --without-selinux --without-smack --without-openssl --without-avahi --without-libmount --disable-rofiles-fuse --disable-experimental-api' From 24e5d6abbab75d87937e64472a4e1e4c906b265b Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 16:00:18 +0200 Subject: [PATCH 16/17] ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master: build Dockerfile, then buildroot and run tests there --- .../projectatomic-rpm-ostree-master.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml index 9cd6ccc767f1f..4b1a40c1dda3c 100644 --- a/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml +++ b/ci-operator/config/projectatomic/rpm-ostree/projectatomic-rpm-ostree-master.yaml @@ -1,9 +1,6 @@ base_images: - cosa-buildroot: + f30: cluster: https://api.ci.openshift.org - # namespace: coreos - # name: cosa-buildroot - # tag: latest name: fedora namespace: rhcos tag: "30" @@ -16,15 +13,18 @@ build_root: tag: golang-1.10 images: -- from: cosa-buildroot - dockerfile_path: ci/prow/Dockerfile +- from: f30 + dockerfile_path: Dockerfile to: rpm-ostree-ci +- from: rpm-ostree-ci + dockerfile_path: Dockerfile.buildroot + to: rpm-ostree-buildroot tests: - as: sanity commands: rpm-ostree --version container: - from: rpm-ostree-ci + from: rpm-ostree-buildroot resources: '*': From d9fe7fae0315b64159a97ad3b267ce1fb165ebba Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 6 Sep 2019 16:26:40 +0200 Subject: [PATCH 17/17] ci-operator/config/ostreedev/ostree/ostreedev-ostree-master: build sanity-dockerfile --- .../ostreedev/ostree/ostreedev-ostree-master.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml index 24461ecce26fd..5430e5830f17d 100644 --- a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml +++ b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-master.yaml @@ -30,25 +30,27 @@ raw_steps: - pipeline_image_cache_step: commands: | cat < /src/ci/prow/Dockerfile.sanity - FROM ostree-ci + FROM buildroot RUN make install DOCKERFILE from: buildroot to: sanity-dockerfile - project_directory_image_build_step: - from: buildroot + from: f30 inputs: + src: + paths: null sanity-dockerfile: paths: - destination_dir: . source_path: /src/ci/prow/Dockerfile.sanity - to: sanity-src + to: base images: - from: f30 to: buildroot dockerfile_path: ci/prow/Dockerfile -- from: sanity-src +- from: sanity-dockerfile to: sanity dockerfile_path: ci/prow/Dockerfile.sanity